<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> f1f4057 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 9710ee6 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5bc98da (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1ebea35 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 7f9bd73 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1f4057 (Manifest_cache true) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 2737f2d (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 7f9bd73 (Manifest_cache true) >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> f1c7248 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9710ee6 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4f1a459 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= >>>>>>> aa4fb26 (Add sort orders) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages)
Generated 2022-10-07T16:34:44+03:00
>>>>>>> 1cb2e82 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 8ad6192 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> a2de409 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 551615f (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true)
Generated 2022-10-07T16:34:44+03:00
>>>>>>> c1749d5 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 8ad6192 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> ea0650c (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> a77cc8a (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 39467b5 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= =======
Generated 2022-10-07T16:34:44+03:00
>>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> cde4834 (Manifest_cache true) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 864f339 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= =======
Generated 2022-10-07T16:34:44+03:00
>>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true)
Generated 2022-10-07T16:34:44+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= =======
Generated 2022-10-09T15:09:44+03:00
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= =======
Generated 2022-10-12T13:22:27+03:00
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= =======
Generated 2022-10-17T14:15:31+03:00
>>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 8ad6192 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) 93.06% >>>>>>> fe7e312 (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 95.44% >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4f1a459 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 95.44% >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) 95.71% ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) 95.44% >>>>>>> 864f339 (Featire specs) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 3e9f99d (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 036bb32 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 697ad44 (Add login registration pages) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) 95.79% ======= 95.44% >>>>>>> 4e7b845 (Manifest_cache true) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bcd09ab (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 022e63e (Manifest_cache true) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> c006a44 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b40a04e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> a9e654b (Manifest_cache true) ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3a43955 (Add login registration pages) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 851b4c0 (Fix) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 8ad6192 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 95.44% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= 93.06% >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= 90.68% >>>>>>> cde4834 (Manifest_cache true) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) 95.71% ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) 95.44% >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) 93.06% >>>>>>> c1749d5 (Featire specs) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 95.44% >>>>>>> 4e7b845 (Manifest_cache true) ======= 93.06% >>>>>>> b8aab1a (Manifest_cache true) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 95.44% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 569a007 (Add login registration pages) ======= ======= 93.06% >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) 93.06% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 92.45% >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= <<<<<<< HEAD 89.69% >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= ======= 88.25% >>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4f1a459 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) 3.25 >>>>>>> 1cb2e82 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 3.34 >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 8ad6192 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 3.34 >>>>>>> a2de409 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) 2.92 ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) 3.34 >>>>>>> 864f339 (Featire specs) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 3e9f99d (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 036bb32 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 697ad44 (Add login registration pages) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) 3.03 ======= 3.34 >>>>>>> 4e7b845 (Manifest_cache true) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bcd09ab (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 022e63e (Manifest_cache true) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> c006a44 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b40a04e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> a9e654b (Manifest_cache true) ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3a43955 (Add login registration pages) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= 3.34 >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 851b4c0 (Fix) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 8ad6192 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 3.34 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= 3.25 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= 1.04 >>>>>>> cde4834 (Manifest_cache true) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) 2.92 ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) 3.34 >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) 3.25 >>>>>>> c1749d5 (Featire specs) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.34 >>>>>>> 4e7b845 (Manifest_cache true) ======= 3.25 >>>>>>> b8aab1a (Manifest_cache true) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= 3.34 >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 3.34 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 569a007 (Add login registration pages) ======= ======= 3.25 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) 3.25 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 3.38 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= 3.25 >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 92 files in total. <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) 92 files in total. ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 112 files in total. >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) 114 files in total. >>>>>>> 8577deb (Featire specs) ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) 92 files in total. ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 112 files in total. >>>>>>> 864f339 (Featire specs) ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 8be9029 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) 90.68% <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) =======
377 relevant lines, 374 lines covered and >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 697ad44 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> d96cf3b (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) =======
377 relevant lines, 374 lines covered and >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 0c3a150 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true) ======= 34 files in total. >>>>>>> cde4834 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) ======= ======= ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 926dfe5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d66884b (Manifest_cache true) 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bebaea7 (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) 114 files in total. >>>>>>> c1749d5 (Featire specs) ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( >>>>>>> f861b82 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) 112 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) 95.44% <<<<<<< HEAD >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 8ad6192 (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b26425c (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) 114 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1441 relevant lines, 1341 lines covered and 100 lines missed. ( <<<<<<< HEAD 93.06% <<<<<<< HEAD >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 90.68% >>>>>>> cde4834 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 20256f8 (Featire specs) 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) 112 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) 95.44% <<<<<<< HEAD >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 120 files in total.
1523 relevant lines, 1408 lines covered and 115 lines missed. ( 92.45% >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= 123 files in total.
1609 relevant lines, 1420 lines covered and 189 lines missed. ( <<<<<<< HEAD 89.69% >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= ======= 88.25% >>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders) )
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) ======= >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= ======= ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) >>>>>>> d15fe1d (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b4763a2 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) >>>>>>> bc0ff2c (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 8c32a77 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 9bebee5 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bcd09ab (Featire specs) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 022e63e (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 9dc109d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ca3b84 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 078304c (Rebased) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2471c87 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 2471c87 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= ======= ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> fb10fe4 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 69eb97e (Add login registration pages) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 089f8cf (Add login registration pages) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= ======= ======= >>>>>>> aa4fb26 (Add sort orders) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> d780a52 (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 60943cc (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> cb74525 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 1577aeb (Rebased) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b35d1f8 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 56ef3ac (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) >>>>>>> 04108c4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7f7abc (Manifest_cache true) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 78d0719 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> 8577deb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) >>>>>>> 5f79779 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 282f108 (Add login registration pages) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 0fc3bf0 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> b35d1f8 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> ab67c96 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 6edce20 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 57 41 41 0 2.49
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 4.71
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 5.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 20.83 % 36 24 5 19 0.21
app/admin/dashboard.rb42.86 % 14 7 3 4 5.86app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 19.23 % 38 26 5 21 0.19
app/controllers/application_controller.rb 100.00 % 15 10 10 0 53.00
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/checkouts_controller.rb 100.00 % 16 10 10 0 1.30
app/controllers/coupons_controller.rb 100.00 % 14 8 8 0 2.88
app/controllers/home_controller.rb 100.00 % 12 7 7 0 8.29
app/controllers/order_books_controller.rb 82.86 % 62 35 29 6 1.74
app/controllers/orders_controller.rb 100.00 % 14 8 8 0 3.38
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.5012.7090.00 % 18 109 1 0.9010 0 12.9028.42
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.402.60
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.7517.75
app/decorators/paginating_decorator.rb 100.00 % 3552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 910 1.00
app/admin/dashboard.rb42.86 % 14 7 3 4 5.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 %13.36app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 10 0 47.20
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/coupons_controller.rb 100.00 % 14 8 8 0 2.8813.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.50
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75
app/decorators/paginating_decorator.rb 100.00 % 352 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 20.83 % 36 24 5 19 0.21
app/admin/dashboard.rb42.86 % 14 7 3 4 5.86app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/deliveries.rb 30.00 % 33 20 6 14 0.30
app/admin/orders.rb 18.52 % 39 27 5 22 0.19
app/controllers/application_controller.rb 100.00 % 29 18 18 0 52.06
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/checkouts_controller.rb 47.76 % 125 67 32 35 0.69
app/controllers/coupons_controller.rb 100.00 % 16 9 9 0 3.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 8.29
app/controllers/order_books_controller.rb 82.86 % 62 35 29 6 1.74
app/controllers/orders_controller.rb 33.33 % 59 33 11 22 0.70
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 80.95 % 43 21 17 4 3.00
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.5012.7090.00 % 18 109 1 0.9010 0 12.9028.4228.4212.7090.00 % 18 109 1 0.9010 0 12.9028.4228.50
app/decorators/delivery_decorator.rb 75.00 % 7 4 3 1 0.75
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.402.602.80
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb100.00 % 13 8 8 014.7513.7517.7519.2590.00 % 17 10 9 1 15.5078.57 % 25 14 11 3 11.79
app/decorators/paginating_decorator.rb 100.00 % 35552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 912 20 1.00
app/controllers/books_controller.rb93.75 % 31 16 15 1 13.94100.00 % 28 14 14 0 13.36app/controllers/books_controller.rbapp/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.86
app/helpers/application_helper.rb 100.00 %7 4 4 0 5.005 3 3 0 4.67
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rbapp/controllers/books_controller.rb100.00 % 2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.901 0.90
app/decorators/category_decorator.rb 100.00 %3 2 2 07 7 01.0012 0 25.67
app/decorators/paginating_decorator.rb 100.00 % 352 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 207 7 01.00
app/controllers/books_controller.rb 93.33 % 30 15 1414 0 13.361 14.13app/controllers/books_controller.rbapp/decorators/review_decorator.rb 100.00 % 7 4 45 2 20 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.001.861.86
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb 100.00 % 7 4 4 0 5.00
app/helpers/constants.rb 100.00 % 27 21 210 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1 0 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rb 100.00 % 2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 07 7 01.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 % 7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/models/address.rb 100.00 % 247 7 0app/controllers/books_controller.rbapp/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb 100.00 % 7 4 4 0 5.00
app/helpers/constants.rb 100.00 % 33 26 26 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.08
app/jobs/cart_cleaner_job.rb 66.67 % 9 6 4 2 0.67
app/models/address.rb 100.00 % 2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rbapp/helpers/application_helper.rb100.00 % 6 2 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 62 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 42 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6100.00 % 6100.00 % 64 4app/helpers/application_helper.rb 100.00 % 32 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 %6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 %6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 20 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 47 5 56 4 47 5 57 5 57 5 57 5 57 5 56 4 46 4 46 4 40 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 40 1.00
app/models/billing.rb 100.00 % 2 1 1 0 1.00
app/models/book.rb 100.00 %17app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 % 13 9 919 10 10app/models/book.rb 100.00 % 15 8 80 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 919 10 10app/models/book.rb 100.00 % 13 9 9app/models/book.rb 100.00 % 13 9 917 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rbapp/models/review.rb100.00 %8 2 2100.00 % 16app/models/user.rbapp/models/review.rb100.00 % 16app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 416 7 70 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.50
app/models/user.rbapp/models/review.rb100.00 % 16app/models/coupon.rb 100.00 % 3app/models/coupon.rb 100.00 % 3app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 3app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/queries/book_query.rb 87.50 % 15 8 7 17.257.507.257.507.257.507.257.50app/models/credit_card.rb 100.00 % 12 6 6 0 1.00
app/models/delivery.rb 100.00 % 5 3 3 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.257.507.257.507.257.507.257.50
app/models/order.rb 100.00 % 9 6 6 0 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16 7 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.00app/models/coupon.rb 100.00 % 3app/models/coupon.rb 100.00 % 3app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 27 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.507.257.507.257.507.257.50app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 57.14 % 23 14 8 6 0.57
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/order.rb 100.00 % 6 4 4 0 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16 7 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 70 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.007.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/queries/order_query.rb 36.36 % 19 11 4 7 0.36
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/checkout_service.rb 50.00 % 7 4 2 2 0.50
app/services/coupon_service.rb 81.82 % 17 11 9 2 1.91
config/application.rb 100.00 % 22 7 7config/application.rb 100.00 % 22 6 6config/application.rb 100.00 % 22 7 76 6config/application.rb 100.00 % 22 6 60 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 %311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 2014 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1313 130 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 3 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8config/initializers/money.rb100.00 % 33 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8config/initializers/money.rb100.00 % 33 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3 0 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %17 9 95 3 37 4 45 3 317 9 95 3 35 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1717 9 917 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1731 17 175 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 45 3 37 4 433 18 185 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1731 17 1733 18 185 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 45 3 37 4 45 3 35 3 37 4 45 3 37 4 45 3 37 4 45 3 37 4 433 18 180 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 0 1.50
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 0 1.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.73
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rbspec/factories/authors.rb100.00 % 6 4 4 08.007.001.008.007.001.008.007.001.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.501.00spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.50
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.001.00spec/factories/books.rb 100.00 % 11 9 9 02.561.00
spec/factories/books.rb 80.95 % 35 2117 446.3845.52spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6217 4 45.52spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3868.0068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6217 4 45.5268.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.56spec/factories/books.rb 80.95 % 35 2115 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5668.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.56
spec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.334.674.673.333.333.331.004.674.671.004.674.673.333.333.333.333.334.674.673.333.331.004.674.673.333.333.333.333.334.674.673.333.333.333.333.334.674.673.333.331.004.674.673.333.333.333.333.334.674.673.333.333.333.333.334.673.333.333.333.334.67
spec/factories/users.rbspec/factories/reviews.rbspec/factories/users.rbspec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/credit_cards.rb 100.00 % 9 7 7 0 1.00
spec/factories/deliveries.rb 100.00 % 7 5 5 0 3.40
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 80.00 % 18 10 8 2 1.50
spec/factories/reviews.rb100.00 % 7 5 5 0 1.00
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4015.20
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.333.33
spec/feature/book_spec.rb100.00 %7 5 5spec/factories/users.rbspec/factories/coupons.rb 100.00 % 8 6 6 0 2.50202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 100.00 % 50 26 26 0 1.62
spec/feature/checkout_spec.rb 100.00 % 59 34 34 0 1.26
spec/feature/coupon_spec.rb 100.00 % 47 28 28 02.17105 105 0 2.372.25
spec/factories/order_books.rb 100.00 %7 5 5 0 1.8096 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/address_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 %4 2 27 5 5spec/factories/users.rbspec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 %4 2 27 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 %4 2 27 5 50 1.00
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 %13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4015.20
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 100.00 % 56 29 29 0 1.45
spec/feature/checkout_spec.rb 100.00 % 62 36 36 0 1.25
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.0596 49 49 096 49 49 01.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 %13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 %13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 815 9 90 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.53spec/models/authors_book_spec.rb 100.00 % 15 9 913 8 80 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 9 0 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.53spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/credit_card_spec.rb 100.00 % 19 13 13 0 1.69
spec/models/delivery_spec.rb 100.00 % 11 6 6 0 1.33
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/user_spec.rb 100.00 %15 9 913 8 815 9 90 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.53
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.53
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.53spec/models/authors_book_spec.rb 100.00 %15 9 9 0 1.44
spec/models/book_spec.rbspec/queryes/book_query_spec.rb100.00 % 23 16 16 01.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 01.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.00
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.00100.00 % 29 19 19 0 1.00100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.377 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.00100.00 %293036.84 % 291919 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.007 12 0.37100.00 % 29 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37
spec/support/configs/shoulda_matcher.rb 100.00 %89889999988999999889999998899999985 5 0 1.00
spec/support/configs/sidekiq.rb 100.00 % 3 2 2 0 1.00
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)
======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register AdminUser do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :email, :password, :password_confirmation
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                id_column
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :email
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :current_sign_in_at
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :sign_in_count
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :created_at
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                actions
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              filter :email
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              filter :current_sign_in_at
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              filter :sign_in_count
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              filter :created_at
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              form do |f|
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                f.inputs do
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  f.input :email
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                  f.input :password
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                  f.input :password_confirmation
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                f.actions
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Author do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.filters = true
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              permit_params :first_name, :last_name
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :books, collection: Book.all
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              filter :first_name
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :last_name
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              index do
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                selectable_column
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                column :first_name
          
    13. 
        
    
      
        
    
          
  13. 
            3
            

            

                column :last_name
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            3
            

            

                actions
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              show do
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                attributes_table do
          
    20. 
        
    
      
        
    
          
  20. 
            3
            

            

                  row :first_name
          
    21. 
        
    
      
        
    
          
  21. 
            3
            

            

                  row :last_name
          
    22. 
        
    
      
        
    
          
  22. 
            3
            

            

                  row :books
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              form do |f|
          
    27. 
        
    
      
        
    
          
  27. 
            2
            

            

                f.inputs do
          
    28. 
        
    
      
        
    
          
  28. 
            2
            

            

                  f.input :first_name
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  f.input :last_name
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                f.actions
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            end
          
    37.

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Book do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                            author_ids: [], category_ids: [], images: []
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              decorate_with BookDecorator
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              filter :categories
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              filter :title
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              filter :year_of_publication
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              index do
          
    13. 
        
    
      
        
    
          
  13. 
            6
            

            

                selectable_column
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            6
            

            

                column :categories, &:categories_names
          
    16. 
        
    
      
        
    
          
  16. 
            6
            

            

                column :title
          
    17. 
        
    
      
        
    
          
  17. 
            6
            

            

                column :authors, &:authors_names
          
    18. 
        
    
      
        
    
          
  18. 
            6
            

            

                column :description
          
    19. 
        
    
      
        
    
          
  19. 
            6
            

            

                column :price, &:price
          
    20. 
        
    
      
        
    
          
  20. 
            6
            

            

                column :quantity
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            6
            

            

                actions
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              show do
          
    26. 
        
    
      
        
    
          
  26. 
            5
            

            

                attributes_table do
          
    27. 
        
    
      
        
    
          
  27. 
            5
            

            

                  row :authors, &:authors_names
          
    28. 
        
    
      
        
    
          
  28. 
            5
            

            

                  row :categories, &:categories_names
          
    29. 
        
    
      
        
    
          
  29. 
            5
            

            

                  row :year_of_publication
          
    30. 
        
    
      
        
    
          
  30. 
            5
            

            

                  row :description
          
    31. 
        
    
      
        
    
          
  31. 
            5
            

            

                  row :materials
          
    32. 
        
    
      
        
    
          
  32. 
            5
            

            

                  row :dimensions
          
    33. 
        
    
      
        
    
          
  33. 
            5
            

            

                  row :price, &:price
          
    34. 
        
    
      
        
    
          
  34. 
            5
            

            

                  row :created_at
          
    35. 
        
    
      
        
    
          
  35. 
            5
            

            

                  row :updated_at
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            5
            

            

                panel :images do
          
    39. 
        
    
      
        
    
          
  39. 
            5
            

            

                  table do
          
    40. 
        
    
      
        
    
          
  40. 
            5
            

            

                    book.images.each do |image|
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                    end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              form do |f|
          
    48. 
        
    
      
        
    
          
  48. 
            6
            

            

                f.inputs do
          
    49. 
        
    
      
        
    
          
  49. 
            6
            

            

                  f.input :title
          
    50. 
        
    
      
        
    
          
  50. 
            6
            

            

                  f.input :description
          
    51. 
        
    
      
        
    
          
  51. 
            6
            

            

                  f.input :year_of_publication
          
    52. 
        
    
      
        
    
          
  52. 
            6
            

            

                  f.input :price_cents
          
    53. 
        
    
      
        
    
          
  53. 
            6
            

            

                  f.input :materials
          
    54. 
        
    
      
        
    
          
  54. 
            6
            

            

                  f.input :dimensions
          
    55. 
        
    
      
        
    
          
  55. 
            6
            

            

                  f.input :quantity
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            6
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    58. 
        
    
      
        
    
          
  58. 
            6
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    59. 
        
    
      
        
    
          
  59. 
            6
            

            

                  f.input :images, as: :file, input_html: { multiple: true }
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            6
            

            

                panel :images do
          
    63. 
        
    
      
        
    
          
  63. 
            6
            

            

                  f.object.images.each do |image|
          
    64. 
        
    
      
        
    
          
  64. 
            1
            

            

                    span image_tag image.variant(resize_to_limit: [100, 100])
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                    span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

                                                                                   data: { confirm: "Delete #{image.filename}?" })
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

                end
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

            
          
    70. 
        
    
      
        
    
          
  70. 
            6
            

            

                f.actions
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

              end
          
    72. 
        
    
      
        
    
          
  72. 
            
            

            

            
          
    73. 
        
    
      
        
    
          
  73. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                ActiveStorage::Attachment.find(params[:id]).purge_later
          
    75. 
        
    
      
        
    
          
  75. 
            1
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

              end
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            end
          
    78.

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Category do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :name, book_ids: []
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              filter :books, collection: Book.all
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :name
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              index do
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                selectable_column
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                column :name
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            3
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            3
            

            

                  row :name
          
    18. 
        
    
      
        
    
          
  18. 
            3
            

            

                  row :created_at
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                  row :updated_at
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

              end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              form do |f|
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                f.inputs do
          
    25. 
        
    
      
        
    
          
  25. 
            2
            

            

                  f.input :name
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                f.actions
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.

app/admin/coupons.rb

20.83% lines covered

24 relevant lines. 5 lines covered and 19 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Coupon do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :code, :is_active, :active_till_date, :discount, :order_id
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :code
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :is_active
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :active_till_date
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :discount
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  row :code
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  row :is_active
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  row :active_till_date
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  row :discount
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  row :order
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              form do |f|
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                f.inputs do
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  f.input :code
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  f.input :is_active
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                  f.input :active_till_date
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

                  f.input :discount
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                  f.input :order
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                f.actions
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            end
          
    37.

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            ActiveAdmin.register_page 'Dashboard' do
          
    4. 
        
    
      
        
    
          
  4. 
            39
            

            

              menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              action_item only: :show do
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                link_to 'SideKiq View', sidekiq_web_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              content title: proc { I18n.t('active_admin.dashboard') } do
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                div class: 'blank_slate_container', id: 'dashboard_default_message' do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  span class: 'blank_slate' do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                    span I18n.t('active_admin.dashboard_welcome.welcome')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    small I18n.t('active_admin.dashboard_welcome.call_to_action')
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            end
          
    19.

app/admin/deliveries.rb

30.0% lines covered

20 relevant lines. 6 lines covered and 14 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Delivery do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :price_cents, :delivery_method, :delivery_day
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              decorate_with DeliveryDecorator
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              index do
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                selectable_column
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :price_cents, &:price
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :delivery_method
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                column :delivery_day
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                actions
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              show do
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                attributes_table do
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  row :price_cents, &:price
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  row :delivery_method
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  row :delivery_day
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              form do |f|
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                f.inputs do
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  f.input :price_cents
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  f.input :delivery_method
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  f.input :delivery_day
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                f.actions
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

              end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            end
          
    34.

app/admin/orders.rb

18.52% lines covered

27 relevant lines. 5 lines covered and 22 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Order do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :user_id, :coupon_id, :address_id, :total_price, :status, :last_action
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :user
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :coupon
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :total_price
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :status
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                column :updated_at
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                actions
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              show do
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                attributes_table do
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  row :user
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  row :coupon
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  row :total_price
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  row :status
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                  row :delivery_id
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                  row :updated_at
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              form do |f|
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                f.inputs do
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                  f.input :user_id
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

                  f.input :coupon_id
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                  f.input :total_price
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  f.input :status, as: :select, collection: %i[confirmed delivered canceled]
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                  f.input :delivery_id
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  f.input :books
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                f.actions
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

              end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            end
          
    40.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 3dc272d (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 20 relevant lines. 8 lines covered and 12 lines missed. ======= ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) 10 relevant lines. 10 lines covered and ======= 1 relevant lines. 1 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 1 relevant lines. 1 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 1 relevant lines. 1 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 1 relevant lines. 1 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= 18 relevant lines. 18 lines covered and >>>>>>> aa4fb26 (Add sort orders) 0 lines missed. >>>>>>> 1a9aba9 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            ActiveAdmin.register AdminUser do
=======
            class ApplicationController < ActionController::Base
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :user_or_guest_have_order
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              after_action :save_previous_path
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              private
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              def user_or_guest_have_order
          
    8. 
        
    
      
        
    
          
  8. 
            185
            

            

                if current_user && (session[:order_id].nil? || Order.where(id: session[:order_id]).empty?)
          
    9. 
        
    
      
        
    
          
  9. 
            15
            

            

                  create_order_for_user
          
    10. 
        
    
      
        
    
          
  10. 
            170
            

            

                elsif session[:order_id].nil? || Order.where(id: session[:order_id]).empty?
          
    11. 
        
    
      
        
    
          
  11. 
            55
            

            

                  create_order_for_guest
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              def create_order_for_user
          
    16. 
        
    
      
        
    
          
  16. 
            15
            

            

                session[:order_id] = Order.find_or_create_by(user_id: current_user.id, status: :initialized).id
          
    17. 
        
    
      
        
    
          
  17. 
            15
            

            

                CartCleanerJob.perform_in(3.days, session[:order_id])
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              def create_order_for_guest
          
    21. 
        
    
      
        
    
          
  21. 
            55
            

            

                session[:order_id] = Order.create.id
          
    22. 
        
    
      
        
    
          
  22. 
            55
            

            

                CartCleanerJob.perform_in(3.days, session[:order_id])
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              def save_previous_path
          
    26. 
        
    
      
        
    
          
  26. 
            182
            

            

                previous_path = request.path
          
    27. 
        
    
      
        
    
          
  27. 
            182
            

            

                session[:previous_path] = previous_path unless previous_path == request.url
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

              end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            end
          
    30.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 93.75% >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 93.75% >>>>>>> 7c4ea7f (Fix) ======= 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= 93.75% >>>>>>> 8f1bc14 (Fix) ======= 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= 93.75% >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 16 relevant lines. 15 lines covered and >>>>>>> 864f339 (Featire specs) 1 lines missed. <<<<<<< HEAD <<<<<<< HEAD ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 9dc109d (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 65f3409 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksController < ApplicationController
>>>>>>> 3dc272d (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              permit_params :email, :password, :password_confirmation
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> 3dc272d (Featire specs)
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              index do
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
              def index
>>>>>>> 3dc272d (Featire specs)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  6. 
            24
<<<<<<< HEAD
=======
=======
          
  7. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  8. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  9. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  10. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  11. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
          
  12. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  13. 
            25
=======
          
  14. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  15. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  16. 
            25
>>>>>>> 65f3409 (Featire specs)
=======
          
  17. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  18. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  19. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  20. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  21. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  22. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  23. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  24. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  25. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
          
  26. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  27. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  28. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  29. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                selectable_column
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
            
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  31. 
            24
<<<<<<< HEAD
=======
=======
          
  32. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  33. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  34. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  35. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  36. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
          
  37. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  38. 
            25
=======
          
  39. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  40. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  41. 
            25
>>>>>>> 65f3409 (Featire specs)
=======
          
  42. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  43. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  44. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  45. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  46. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  47. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  48. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  49. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  50. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
          
  51. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  52. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  53. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  54. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                id_column
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  55. 
            
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  56. 
            24
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  57. 
            24
=======
          
  58. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  59. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  60. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  61. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  62. 
            25
=======
          
  63. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  64. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  65. 
            25
>>>>>>> 65f3409 (Featire specs)
=======
          
  66. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  67. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  68. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  69. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  70. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  71. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  72. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  73. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  74. 
            25
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  75. 
            25
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                column :email
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
          
  77. 
>>>>>>> 1577aeb (Rebased)
            
=======
          
  78. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  79. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  80. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  81. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  82. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  83. 
            
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  84. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
          
  85. 
            
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  86. 
            
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  87. 
            
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                column :current_sign_in_at
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

            
          
    89. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  89. 
            25
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
                @books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
              def index
          
    90. 
        
    
      
        
    
          
  90. 
            25
            

            

                @books_count = Book.count
          
    91. 
        
    
      
        
    
          
  91. 
            25
            

            

                @categories = Category.all
          
    92. 
        
    
      
        
    
          
  92. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  93. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  94. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  95. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  96. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
          
  97. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
          
  98. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
            

            

                sorted_books = BookQuery.query(params).paginate(page: params[:page],
          
    99. 
        
    
      
        
    
          
  99. 
            
            

            

                                                                per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    100. 
        
    
      
        
    
<<<<<<< HEAD
          
  100. 
            
            

            

                column :sign_in_count
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                column :created_at
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

                actions
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

              end
          
    104. 
        
    
      
        
    
          
  104. 
=======
          
  105. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  106. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  107. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  108. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
            
            

            

            
          
    109. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  109. 
            1
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  110. 
            24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  111. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  112. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  113. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  114. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
            

            

<<<<<<< HEAD
              filter :email
          
    115. 
        
    
      
        
    
          
  115. 
            1
            

            

              filter :current_sign_in_at
          
    116. 
        
    
      
        
    
          
  116. 
            1
            

            

              filter :sign_in_count
          
    117. 
        
    
      
        
    
          
  117. 
            1
            

            

              filter :created_at
          
    118. 
        
    
      
        
    
          
  118. 
            
            

            

            
          
    119. 
        
    
      
        
    
          
  119. 
            1
            

            

              form do |f|
          
    120. 
        
    
      
        
    
          
  120. 
            
            

            

                f.inputs do
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

                  f.input :email
          
    122. 
        
    
      
        
    
          
  122. 
            
            

            

                  f.input :password
          
    123. 
        
    
      
        
    
          
  123. 
            
            

            

                  f.input :password_confirmation
          
    124. 
        
    
      
        
    
          
  124. 
            
            

            

                end
          
    125. 
        
    
      
        
    
          
  125. 
            
            

            

                f.actions
          
    126. 
        
    
      
        
    
          
  126. 
            
            

            

              end
          
    127. 
        
    
      
        
    
          
  127. 
            
            

            

            end
          
    128.

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Author do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.filters = true
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              permit_params :first_name, :last_name
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :books, collection: Book.all
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              filter :first_name
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :last_name
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              index do
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                selectable_column
=======
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
          
  11. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
            

            

            
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
          
  17. 
            3
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  18. 
            24
<<<<<<< HEAD
=======
=======
          
  19. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  20. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  21. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  22. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  23. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
=======
          
  24. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  25. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  26. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
          
  27. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  28. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  29. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  30. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  31. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
          
  32. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
          
  33. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
            

            

                @books = BookDecorator.decorate_collection(sorted_books)
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  35. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  36. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  37. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  38. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  39. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  40. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  41. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
          
  42. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  43. 
            25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  44. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  45. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  46. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
          
  47. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                column :first_name
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            3
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  49. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  50. 
            24
<<<<<<< HEAD
=======
=======
          
  51. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  52. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  53. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  54. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  55. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  56. 
            25
=======
          
  57. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  58. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  59. 
            25
>>>>>>> 65f3409 (Featire specs)
=======
          
  60. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  61. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  62. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  63. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  64. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  65. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  66. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  67. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
          
  68. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  69. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  70. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  71. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
          
  72. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  73. 
            25
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  74. 
            25
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                column :last_name
          
    75. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  75. 
            
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  76. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  77. 
            24
<<<<<<< HEAD
=======
=======
          
  78. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  79. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  80. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  81. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  82. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  83. 
            25
=======
          
  84. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  85. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  86. 
            25
>>>>>>> 65f3409 (Featire specs)
=======
          
  87. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  88. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  89. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  90. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  91. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  92. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  93. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  94. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
          
  95. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  96. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  97. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  98. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 60943cc (Add login registration pages)
=======
=======
          
  99. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  100. 
            25
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  101. 
            25
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

            
          
    102. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  102. 
            3
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
          
  103. 
=======
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  104. 
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  105. 
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  106. 
>>>>>>> e54ceb0 (Featire specs)
=======
          
  107. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  108. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  109. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  110. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  111. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  112. 
>>>>>>> e54deeb (Featire specs)
=======
          
  113. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  114. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  115. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  116. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  117. 
=======
          
  118. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  119. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  120. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  121. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  122. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
          
  123. 
=======
          
  124. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  125. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  126. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  127. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  128. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  129. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  130. 
>>>>>>> a5d032d (Fix)
=======
          
  131. 
=======
          
  132. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  133. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  134. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  135. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  136. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  137. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  138. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  139. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  140. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  141. 
=======
          
  142. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
          
  143. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
          
  144. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
=======
          
  145. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
          
  146. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  147. 
>>>>>>> 8f1bc14 (Fix)
            1
>>>>>>> 3dc272d (Featire specs)
            

            

                actions
          
    148. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  148. 
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
          
  149. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  150. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  151. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  152. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  153. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  154. 
>>>>>>> e54deeb (Featire specs)
=======
          
  155. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  156. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  157. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  158. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  159. 
=======
          
  160. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  161. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  162. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  163. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  164. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  165. 
=======
          
  166. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  167. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  168. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  169. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  170. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  171. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  172. 
>>>>>>> a5d032d (Fix)
=======
          
  173. 
=======
          
  174. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  175. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  176. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  177. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  178. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  179. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  180. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  181. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  182. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

<<<<<<< HEAD
              end
=======
                      entries: render_to_string(partial: 'books/index/books', formats: [:html]),
>>>>>>> 1a9aba9 (Fix)
          
    183. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  183. 
=======
          
  184. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  185. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  186. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  187. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  188. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  189. 
>>>>>>> e54deeb (Featire specs)
=======
          
  190. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  191. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  192. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  193. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  194. 
=======
          
  195. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  196. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  197. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  198. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  199. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  200. 
=======
          
  201. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  202. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  203. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  204. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  205. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  206. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  207. 
>>>>>>> a5d032d (Fix)
=======
          
  208. 
=======
          
  209. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  210. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  211. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  212. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  213. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  214. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  215. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  216. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  217. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    218. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  218. 
            1
            

            

              show do
          
    219. 
        
    
      
        
    
          
  219. 
            3
            

            

                attributes_table do
          
    220. 
        
    
      
        
    
          
  220. 
            3
            

            

                  row :first_name
          
    221. 
        
    
      
        
    
          
  221. 
            3
            

            

                  row :last_name
          
    222. 
        
    
      
        
    
          
  222. 
            3
            

            

                  row :books
          
    223. 
        
    
      
        
    
          
  223. 
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
          
  224. 
=======
          
  225. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  226. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  227. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  228. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  229. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  230. 
>>>>>>> e54deeb (Featire specs)
=======
          
  231. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  232. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  233. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  234. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  235. 
=======
          
  236. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  237. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  238. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  239. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  240. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  241. 
=======
          
  242. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
          
  243. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  244. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  245. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  246. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  247. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  248. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  249. 
=======
          
  250. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  251. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  252. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  253. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  254. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  255. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  256. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  257. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  258. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                end
          
    259. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  259. 
            
            

            

              end
          
    260. 
        
    
      
        
    
          
  260. 
            
            

            

            
          
    261. 
        
    
      
        
    
          
  261. 
            1
            

            

              form do |f|
          
    262. 
        
    
      
        
    
          
  262. 
            2
            

            

                f.inputs do
          
    263. 
        
    
      
        
    
          
  263. 
            2
            

            

                  f.input :first_name
          
    264. 
        
    
      
        
    
          
  264. 
            2
            

            

                  f.input :last_name
          
    265. 
        
    
      
        
    
          
  265. 
            
            

            

            
          
    266. 
        
    
      
        
    
          
  266. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    267. 
        
    
      
        
    
          
  267. 
            
            

            

                end
          
    268. 
        
    
      
        
    
          
  268. 
            
            

            

            
          
    269. 
        
    
      
        
    
          
  269. 
            2
            

            

                f.actions
          
    270. 
        
    
      
        
    
          
  270. 
            
            

            

              end
          
    271. 
        
    
      
        
    
          
  271. 
            
            

            

            end
          
    272.

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Book do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                            author_ids: [], category_ids: [], images: []
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              decorate_with BookDecorator
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              filter :categories
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              filter :title
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              filter :year_of_publication
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              index do
          
    13. 
        
    
      
        
    
          
  13. 
            6
            

            

                selectable_column
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            6
            

            

                column :categories, &:categories_names
          
    16. 
        
    
      
        
    
          
  16. 
            6
            

            

                column :title
          
    17. 
        
    
      
        
    
          
  17. 
            6
            

            

                column :authors, &:authors_names
          
    18. 
        
    
      
        
    
          
  18. 
            6
            

            

                column :description
          
    19. 
        
    
      
        
    
          
  19. 
            6
            

            

                column :price, &:price
          
    20. 
        
    
      
        
    
          
  20. 
            6
            

            

                column :quantity
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            6
            

            

                actions
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              show do
          
    26. 
        
    
      
        
    
          
  26. 
            5
            

            

                attributes_table do
          
    27. 
        
    
      
        
    
          
  27. 
            5
            

            

                  row :authors, &:authors_names
          
    28. 
        
    
      
        
    
          
  28. 
            5
            

            

                  row :categories, &:categories_names
          
    29. 
        
    
      
        
    
          
  29. 
            5
            

            

                  row :year_of_publication
          
    30. 
        
    
      
        
    
          
  30. 
            5
            

            

                  row :description
          
    31. 
        
    
      
        
    
          
  31. 
            5
            

            

                  row :materials
          
    32. 
        
    
      
        
    
          
  32. 
            5
            

            

                  row :dimensions
          
    33. 
        
    
      
        
    
          
  33. 
            5
            

            

                  row :price, &:price
          
    34. 
        
    
      
        
    
          
  34. 
            5
            

            

                  row :created_at
          
    35. 
        
    
      
        
    
          
  35. 
            5
            

            

                  row :updated_at
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            5
            

            

                panel :images do
          
    39. 
        
    
      
        
    
          
  39. 
            5
            

            

                  table do
          
    40. 
        
    
      
        
    
          
  40. 
            5
            

            

                    book.images.each do |image|
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                    end
          
    43. 
        
    
      
        
    
          
  43. 
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
          
  44. 
=======
          
  45. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  46. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  47. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  48. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  49. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  50. 
>>>>>>> e54deeb (Featire specs)
=======
          
  51. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  53. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  54. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  55. 
=======
          
  56. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  58. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  60. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  61. 
=======
          
  62. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
          
  63. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  64. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  66. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  67. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  68. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  69. 
=======
          
  70. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  71. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  72. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  73. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  74. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  75. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  76. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  77. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  78. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                  end
          
    79. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  79. 
            
            

            

                end
          
    80. 
        
    
      
        
    
          
  80. 
            
            

            

              end
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

              form do |f|
          
    83. 
        
    
      
        
    
          
  83. 
            6
            

            

                f.inputs do
          
    84. 
        
    
      
        
    
          
  84. 
            6
            

            

                  f.input :title
          
    85. 
        
    
      
        
    
          
  85. 
            6
            

            

                  f.input :description
          
    86. 
        
    
      
        
    
          
  86. 
            6
            

            

                  f.input :year_of_publication
          
    87. 
        
    
      
        
    
          
  87. 
            6
            

            

                  f.input :price_cents
          
    88. 
        
    
      
        
    
          
  88. 
            6
            

            

                  f.input :materials
          
    89. 
        
    
      
        
    
          
  89. 
            6
            

            

                  f.input :dimensions
          
    90. 
        
    
      
        
    
          
  90. 
            6
            

            

                  f.input :quantity
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            6
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    93. 
        
    
      
        
    
          
  93. 
            6
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    94. 
        
    
      
        
    
          
  94. 
            6
            

            

                  f.input :images, as: :file, input_html: { multiple: true }
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

                end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            
          
    97. 
        
    
      
        
    
          
  97. 
            6
            

            

                panel :images do
          
    98. 
        
    
      
        
    
          
  98. 
            6
            

            

                  f.object.images.each do |image|
          
    99. 
        
    
      
        
    
          
  99. 
            1
            

            

                    span image_tag image.variant(resize_to_limit: [100, 100])
          
    100. 
        
    
      
        
    
          
  100. 
            1
            

            

                    span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                                                                                   data: { confirm: "Delete #{image.filename}?" })
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

                  end
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

                end
          
    104. 
        
    
      
        
    
          
  104. 
            
            

            

            
          
    105. 
        
    
      
        
    
          
  105. 
            6
            

            

                f.actions
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

              end
          
    107. 
        
    
      
        
    
          
  107. 
            
            

            

            
          
    108. 
        
    
      
        
    
          
  108. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    109. 
        
    
      
        
    
          
  109. 
            1
            

            

                ActiveStorage::Attachment.find(params[:id]).purge_later
          
    110. 
        
    
      
        
    
          
  110. 
            1
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    111. 
        
    
      
        
    
          
  111. 
            
            

            

              end
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

            end
          
    113.

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Category do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :name, book_ids: []
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              filter :books, collection: Book.all
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :name
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              index do
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                selectable_column
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                column :name
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            3
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            3
            

            

                  row :name
          
    18. 
        
    
      
        
    
          
  18. 
            3
            

            

                  row :created_at
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                  row :updated_at
          
    20. 
        
    
      
        
    
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
          
  20. 
=======
          
  21. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  22. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  23. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  24. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  25. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  26. 
>>>>>>> e54deeb (Featire specs)
=======
          
  27. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  28. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  29. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  30. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  31. 
=======
          
  32. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  33. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  34. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  35. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  36. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  41. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  42. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  43. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  44. 
>>>>>>> a5d032d (Fix)
=======
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  49. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  50. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  51. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  52. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  53. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  54. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

                end
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  55. 
=======
          
  56. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  57. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  58. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  59. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  60. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  61. 
>>>>>>> e54deeb (Featire specs)
=======
          
  62. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  63. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  64. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  66. 
=======
          
  67. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  68. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  69. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  70. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  71. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  72. 
=======
          
  73. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  74. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  75. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  76. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  77. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  78. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  79. 
>>>>>>> a5d032d (Fix)
=======
          
  80. 
=======
          
  81. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  82. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  83. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  84. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  85. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  86. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  87. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  88. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  89. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

              end
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  90. 
=======
          
  91. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  92. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  93. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  94. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  95. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  96. 
>>>>>>> e54deeb (Featire specs)
=======
          
  97. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  98. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  99. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  100. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  101. 
=======
          
  102. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  103. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  104. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  105. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  106. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  107. 
=======
          
  108. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  109. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  110. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  111. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  112. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  113. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  114. 
>>>>>>> a5d032d (Fix)
=======
          
  115. 
=======
          
  116. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  117. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  118. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  119. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  120. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  121. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  122. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  123. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  124. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    125. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  125. 
=======
          
  126. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  127. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  128. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  129. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  130. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  131. 
>>>>>>> e54deeb (Featire specs)
=======
          
  132. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  133. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  134. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  135. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  136. 
=======
          
  137. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  138. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  139. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  140. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  141. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  142. 
=======
          
  143. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  144. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  145. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  146. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  147. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  148. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  149. 
>>>>>>> a5d032d (Fix)
=======
          
  150. 
=======
          
  151. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  152. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  153. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  154. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  155. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  156. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  157. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  158. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  159. 
>>>>>>> 7c4ea7f (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              form do |f|
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
              def show
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
          
    160. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  160. 
            2
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
<<<<<<< HEAD
          
  161. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  162. 
=======
          
  163. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  164. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  165. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  166. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  167. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  168. 
            11
=======
          
  169. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  170. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  171. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  172. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  173. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  174. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  175. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  176. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  177. 
            7
>>>>>>> 4552227 (Featire specs)
=======
          
  178. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
          
  179. 
            15
>>>>>>> 7c4ea7f (Fix)
            

            

                book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  180. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  181. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  182. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                f.inputs do
          
    183. 
        
    
      
        
    
          
  183. 
            2
            

            

                  f.input :name
          
    184. 
        
    
      
        
    
          
  184. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    185. 
        
    
      
        
    
          
  185. 
            
            

            

                end
          
    186. 
        
    
      
        
    
          
  186. 
            
            

            

            
          
    187. 
        
    
      
        
    
          
  187. 
            2
            

            

                f.actions
          
    188. 
        
    
      
        
    
          
  188. 
            
            

            

              end
          
    189. 
        
    
      
        
    
          
  189. 
            
            

            

            end
          
    190.

app/admin/coupons.rb

20.83% lines covered

24 relevant lines. 5 lines covered and 19 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Coupon do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :code, :is_active, :active_till_date, :discount, :order_id
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :code
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :is_active
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :active_till_date
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :discount
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  row :code
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  row :is_active
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  row :active_till_date
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  row :discount
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  row :order
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              form do |f|
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                f.inputs do
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  f.input :code
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  f.input :is_active
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                  f.input :active_till_date
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

                  f.input :discount
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                  f.input :order
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                f.actions
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            end
          
    37.

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            ActiveAdmin.register_page 'Dashboard' do
          
    4. 
        
    
      
        
    
          
  4. 
            39
            

            

              menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              action_item only: :show do
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                link_to 'SideKiq View', sidekiq_web_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              content title: proc { I18n.t('active_admin.dashboard') } do
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                div class: 'blank_slate_container', id: 'dashboard_default_message' do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  span class: 'blank_slate' do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                    span I18n.t('active_admin.dashboard_welcome.welcome')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    small I18n.t('active_admin.dashboard_welcome.call_to_action')
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            end
          
    19.

app/admin/orders.rb

19.23% lines covered

26 relevant lines. 5 lines covered and 21 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Order do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :user_id, :coupon_id, :total_price, :status, :last_action
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :user
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :coupon
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :total_price
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :status
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                column :last_action
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                actions
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              show do
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                attributes_table do
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  row :user
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  row :coupon
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  row :total_price
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  row :status
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                  row :last_action
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @book = Book.find(params[:id]).decorate
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
                book = Book.find_by(id: params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                book = Book.find(params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  25. 
=======
          
  26. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  27. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  28. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  29. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  30. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  31. 
>>>>>>> e54deeb (Featire specs)
=======
          
  32. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  33. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  34. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  35. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  36. 
=======
          
  37. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  38. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  39. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  40. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  41. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  42. 
=======
          
  43. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  44. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  45. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  46. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  47. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  48. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  49. 
>>>>>>> a5d032d (Fix)
=======
          
  50. 
=======
          
  51. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  52. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  53. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  54. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  55. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  56. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  57. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  58. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  59. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    60. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  60. 
            1
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
          
  61. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  62. 
=======
          
  63. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  64. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  65. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  66. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  67. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  68. 
            11
=======
          
  69. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  70. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  71. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  72. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  73. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  74. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  75. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  76. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  77. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  78. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  79. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  80. 
            15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              form do |f|
=======
                if book.nil?
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
                if book.nil?
=======
                redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    81. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  81. 
            
            

            

                f.inputs do
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

                  f.input :user_id
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                  f.input :coupon_id
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

                  f.input :total_price
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

                  f.input :status
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

                  f.input :last_action
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

                  f.input :books
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

                end
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

                f.actions
          
    91. 
        
    
      
        
    
          
  91. 
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
<<<<<<< HEAD
          
  92. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  93. 
=======
          
  94. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  95. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  96. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  97. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
          
  98. 
            
            

            

                  redirect_to books_path
          
    99. 
        
    
      
        
    
          
  99. 
            
            

            

                else
          
    100. 
        
    
      
        
    
          
  100. 
            15
            

            

<<<<<<< HEAD
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    101. 
        
    
      
        
    
          
  101. 
            15
            

            

>>>>>>> a5d032d (Fix)
                  @book = book.decorate
          
    102. 
        
    
      
        
    
<<<<<<< HEAD
          
  102. 
=======
          
  103. 
>>>>>>> a5d032d (Fix)
            
            

            

                end
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  104. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
          
  105. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
          
  106. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  107. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  108. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  109. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  110. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  111. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  112. 
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
          
  113. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  114. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  115. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  116. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  117. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  118. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  119. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  120. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  121. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  122. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

              end
          
    123. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  123. 
            
            

            

            end
          
    124.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
>>>>>>> 715fac2 (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 20 relevant lines. 8 lines covered and 12 lines missed. ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) 10 relevant lines. 10 lines covered and 0 lines missed. >>>>>>> 0b5b269 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            ActiveAdmin.register AdminUser do
=======
            class ApplicationController < ActionController::Base
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :user_or_guest_have_order
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              private
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def user_or_guest_have_order
          
    7. 
        
    
      
        
    
          
  7. 
            187
            

            

                if current_user
          
    8. 
        
    
      
        
    
          
  8. 
            42
            

            

                  session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
          
    9. 
        
    
      
        
    
          
  9. 
            42
            

            

                  CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
          
    10. 
        
    
      
        
    
          
  10. 
            145
            

            

                elsif session[:order_id].nil? || Order.where(id: session[:order_id]).empty?
          
    11. 
        
    
      
        
    
          
  11. 
            55
            

            

                  session[:order_id] = Order.create.id
          
    12. 
        
    
      
        
    
          
  12. 
            55
            

            

                  CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 93.75% >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 93.75% >>>>>>> 7c4ea7f (Fix) ======= 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= 93.75% >>>>>>> 8f1bc14 (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) 16 relevant lines. 15 lines covered and >>>>>>> 864f339 (Featire specs) 1 lines missed. <<<<<<< HEAD ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 9dc109d (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksController < ApplicationController
>>>>>>> 715fac2 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              permit_params :email, :password, :password_confirmation
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> 715fac2 (Featire specs)
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              index do
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
              def index
>>>>>>> 715fac2 (Featire specs)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  6. 
            24
<<<<<<< HEAD
=======
=======
          
  7. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
          
  8. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  9. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  10. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  11. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
          
  12. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  13. 
            25
=======
          
  14. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  15. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  16. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  17. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  18. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  19. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  20. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  21. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  22. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  23. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  24. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
          
  25. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  26. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  27. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  28. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

                selectable_column
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
            
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  30. 
            24
<<<<<<< HEAD
=======
=======
          
  31. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
          
  32. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  33. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  34. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  35. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
          
  36. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  37. 
            25
=======
          
  38. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  39. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  40. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  41. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  42. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  43. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  44. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  45. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  46. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  47. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  48. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
          
  49. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  50. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  51. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  52. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

                id_column
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  53. 
            
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  54. 
            24
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  55. 
            24
=======
          
  56. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  57. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  58. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  59. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  60. 
            25
=======
          
  61. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  62. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  63. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  64. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  65. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  66. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  67. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  68. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  69. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  70. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  71. 
            25
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                column :email
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
          
    72. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  72. 
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
          
  73. 
>>>>>>> 836a973 (Rebased)
            
=======
          
  74. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  75. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  76. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  77. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  78. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  79. 
            
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  80. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
          
  81. 
            
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  82. 
            
>>>>>>> 8f1bc14 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                column :current_sign_in_at
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 8f1bc14 (Fix)
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

            
          
    84. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
          
  84. 
            25
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
                @books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
              def index
          
    85. 
        
    
      
        
    
          
  85. 
            25
            

            

                @books_count = Book.count
          
    86. 
        
    
      
        
    
          
  86. 
            25
            

            

                @categories = Category.all
          
    87. 
        
    
      
        
    
          
  87. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  88. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  89. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  90. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  91. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
          
  92. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
          
  93. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
            

            

                sorted_books = BookQuery.query(params).paginate(page: params[:page],
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                                                                per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
          
    95. 
        
    
      
        
    
<<<<<<< HEAD
          
  95. 
            
            

            

                column :sign_in_count
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

                column :created_at
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

                actions
          
    98. 
        
    
      
        
    
          
  98. 
            
            

            

              end
          
    99. 
        
    
      
        
    
          
  99. 
=======
          
  100. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  101. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  102. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  103. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
            
            

            

            
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  104. 
            1
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  105. 
            24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  106. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  107. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  108. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  109. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
            

            

<<<<<<< HEAD
              filter :email
          
    110. 
        
    
      
        
    
          
  110. 
            1
            

            

              filter :current_sign_in_at
          
    111. 
        
    
      
        
    
          
  111. 
            1
            

            

              filter :sign_in_count
          
    112. 
        
    
      
        
    
          
  112. 
            1
            

            

              filter :created_at
          
    113. 
        
    
      
        
    
          
  113. 
            
            

            

            
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

              form do |f|
          
    115. 
        
    
      
        
    
          
  115. 
            
            

            

                f.inputs do
          
    116. 
        
    
      
        
    
          
  116. 
            
            

            

                  f.input :email
          
    117. 
        
    
      
        
    
          
  117. 
            
            

            

                  f.input :password
          
    118. 
        
    
      
        
    
          
  118. 
            
            

            

                  f.input :password_confirmation
          
    119. 
        
    
      
        
    
          
  119. 
            
            

            

                end
          
    120. 
        
    
      
        
    
          
  120. 
            
            

            

                f.actions
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

              end
          
    122. 
        
    
      
        
    
          
  122. 
            
            

            

            end
          
    123.

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Author do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.filters = true
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              permit_params :first_name, :last_name
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :books, collection: Book.all
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              filter :first_name
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :last_name
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              index do
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                selectable_column
=======
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
          
  11. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
            

            

            
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
          
  17. 
            3
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  18. 
            24
<<<<<<< HEAD
=======
=======
          
  19. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  20. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  21. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  22. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  23. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 9dc109d (Featire specs)
=======
          
  24. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  25. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  26. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
          
  27. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  28. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  29. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  30. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  31. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
          
  32. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
          
  33. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
            

            

                @books = BookDecorator.decorate_collection(sorted_books)
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  35. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  36. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  37. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  38. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  39. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  40. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  41. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
          
  42. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  43. 
            25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  44. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  45. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  46. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
          
  47. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

                column :first_name
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            3
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  49. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  50. 
            24
<<<<<<< HEAD
=======
=======
          
  51. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  52. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  53. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  54. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  55. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  56. 
            25
=======
          
  57. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  58. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  59. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  60. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  61. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  62. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  63. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  64. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  65. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  66. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
          
  67. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  68. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  69. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  70. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
          
  71. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  72. 
            25
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

                column :last_name
          
    73. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  73. 
            
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  74. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  75. 
            24
<<<<<<< HEAD
=======
=======
          
  76. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  77. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  78. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  79. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  80. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  81. 
            25
=======
          
  82. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  83. 
            25
>>>>>>> 9dc109d (Featire specs)
=======
          
  84. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  85. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  86. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  87. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  88. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  89. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  90. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  91. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
          
  92. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  93. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  94. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  95. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
          
  96. 
            25
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  97. 
            25
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

            
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  98. 
            3
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
          
  99. 
=======
          
  100. 
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  101. 
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  102. 
>>>>>>> e54ceb0 (Featire specs)
=======
          
  103. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  104. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  105. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  106. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  107. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  108. 
>>>>>>> e54deeb (Featire specs)
=======
          
  109. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  110. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  111. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  112. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  113. 
=======
          
  114. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  115. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  116. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  117. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  118. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
          
  119. 
=======
          
  120. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  121. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  122. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  123. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  124. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  125. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  126. 
>>>>>>> a5d032d (Fix)
=======
          
  127. 
=======
          
  128. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  129. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  130. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  131. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  132. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  133. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  134. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  135. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  136. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  137. 
=======
          
  138. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
          
  139. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
          
  140. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
=======
          
  141. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
          
  142. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  143. 
>>>>>>> 8f1bc14 (Fix)
            1
>>>>>>> 715fac2 (Featire specs)
            

            

                actions
          
    144. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  144. 
=======
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
          
  145. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  146. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  147. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  148. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  149. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  150. 
>>>>>>> e54deeb (Featire specs)
=======
          
  151. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  152. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  153. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  154. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  155. 
=======
          
  156. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  157. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  158. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  159. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  160. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  161. 
=======
          
  162. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  163. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  164. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  165. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  166. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  167. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  168. 
>>>>>>> a5d032d (Fix)
=======
          
  169. 
=======
          
  170. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  171. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  172. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  173. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  174. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  175. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  176. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  177. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  178. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

<<<<<<< HEAD
              end
=======
                      entries: render_to_string(partial: 'books/index/books', formats: [:html]),
>>>>>>> 0b5b269 (Fix)
          
    179. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  179. 
=======
          
  180. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  181. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  182. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  183. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  184. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  185. 
>>>>>>> e54deeb (Featire specs)
=======
          
  186. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  187. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  188. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  189. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  190. 
=======
          
  191. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  192. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  193. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  194. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  195. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  196. 
=======
          
  197. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  198. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  199. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  200. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  201. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  202. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  203. 
>>>>>>> a5d032d (Fix)
=======
          
  204. 
=======
          
  205. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  206. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  207. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  208. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  209. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  210. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  211. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  212. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  213. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    214. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  214. 
            1
            

            

              show do
          
    215. 
        
    
      
        
    
          
  215. 
            3
            

            

                attributes_table do
          
    216. 
        
    
      
        
    
          
  216. 
            3
            

            

                  row :first_name
          
    217. 
        
    
      
        
    
          
  217. 
            3
            

            

                  row :last_name
          
    218. 
        
    
      
        
    
          
  218. 
            3
            

            

                  row :books
          
    219. 
        
    
      
        
    
          
  219. 
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
          
  220. 
=======
          
  221. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  222. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  223. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  224. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  225. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  226. 
>>>>>>> e54deeb (Featire specs)
=======
          
  227. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  228. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  229. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  230. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  231. 
=======
          
  232. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  233. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  234. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  235. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  236. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  237. 
=======
          
  238. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
          
  239. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  240. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  241. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  242. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  243. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  244. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  245. 
=======
          
  246. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  247. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  248. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  249. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  250. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  251. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  252. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  253. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  254. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
            
            

            

                end
          
    255. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  255. 
            
            

            

              end
          
    256. 
        
    
      
        
    
          
  256. 
            
            

            

            
          
    257. 
        
    
      
        
    
          
  257. 
            1
            

            

              form do |f|
          
    258. 
        
    
      
        
    
          
  258. 
            2
            

            

                f.inputs do
          
    259. 
        
    
      
        
    
          
  259. 
            2
            

            

                  f.input :first_name
          
    260. 
        
    
      
        
    
          
  260. 
            2
            

            

                  f.input :last_name
          
    261. 
        
    
      
        
    
          
  261. 
            
            

            

            
          
    262. 
        
    
      
        
    
          
  262. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    263. 
        
    
      
        
    
          
  263. 
            
            

            

                end
          
    264. 
        
    
      
        
    
          
  264. 
            
            

            

            
          
    265. 
        
    
      
        
    
          
  265. 
            2
            

            

                f.actions
          
    266. 
        
    
      
        
    
          
  266. 
            
            

            

              end
          
    267. 
        
    
      
        
    
          
  267. 
            
            

            

            end
          
    268.

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Book do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                            author_ids: [], category_ids: [], images: []
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              decorate_with BookDecorator
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              filter :categories
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              filter :title
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              filter :year_of_publication
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              index do
          
    13. 
        
    
      
        
    
          
  13. 
            6
            

            

                selectable_column
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            6
            

            

                column :categories, &:categories_names
          
    16. 
        
    
      
        
    
          
  16. 
            6
            

            

                column :title
          
    17. 
        
    
      
        
    
          
  17. 
            6
            

            

                column :authors, &:authors_names
          
    18. 
        
    
      
        
    
          
  18. 
            6
            

            

                column :description
          
    19. 
        
    
      
        
    
          
  19. 
            6
            

            

                column :price, &:price
          
    20. 
        
    
      
        
    
          
  20. 
            6
            

            

                column :quantity
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            6
            

            

                actions
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              show do
          
    26. 
        
    
      
        
    
          
  26. 
            5
            

            

                attributes_table do
          
    27. 
        
    
      
        
    
          
  27. 
            5
            

            

                  row :authors, &:authors_names
          
    28. 
        
    
      
        
    
          
  28. 
            5
            

            

                  row :categories, &:categories_names
          
    29. 
        
    
      
        
    
          
  29. 
            5
            

            

                  row :year_of_publication
          
    30. 
        
    
      
        
    
          
  30. 
            5
            

            

                  row :description
          
    31. 
        
    
      
        
    
          
  31. 
            5
            

            

                  row :materials
          
    32. 
        
    
      
        
    
          
  32. 
            5
            

            

                  row :dimensions
          
    33. 
        
    
      
        
    
          
  33. 
            5
            

            

                  row :price, &:price
          
    34. 
        
    
      
        
    
          
  34. 
            5
            

            

                  row :created_at
          
    35. 
        
    
      
        
    
          
  35. 
            5
            

            

                  row :updated_at
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            5
            

            

                panel :images do
          
    39. 
        
    
      
        
    
          
  39. 
            5
            

            

                  table do
          
    40. 
        
    
      
        
    
          
  40. 
            5
            

            

                    book.images.each do |image|
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                    end
          
    43. 
        
    
      
        
    
          
  43. 
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
          
  44. 
=======
          
  45. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  46. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  47. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  48. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  49. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  50. 
>>>>>>> e54deeb (Featire specs)
=======
          
  51. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  53. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  54. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  55. 
=======
          
  56. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  58. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  60. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  61. 
=======
          
  62. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
          
  63. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  64. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  66. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  67. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  68. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  69. 
=======
          
  70. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  71. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  72. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  73. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  74. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  75. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  76. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  77. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  78. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
            
            

            

                  end
          
    79. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  79. 
            
            

            

                end
          
    80. 
        
    
      
        
    
          
  80. 
            
            

            

              end
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

              form do |f|
          
    83. 
        
    
      
        
    
          
  83. 
            6
            

            

                f.inputs do
          
    84. 
        
    
      
        
    
          
  84. 
            6
            

            

                  f.input :title
          
    85. 
        
    
      
        
    
          
  85. 
            6
            

            

                  f.input :description
          
    86. 
        
    
      
        
    
          
  86. 
            6
            

            

                  f.input :year_of_publication
          
    87. 
        
    
      
        
    
          
  87. 
            6
            

            

                  f.input :price_cents
          
    88. 
        
    
      
        
    
          
  88. 
            6
            

            

                  f.input :materials
          
    89. 
        
    
      
        
    
          
  89. 
            6
            

            

                  f.input :dimensions
          
    90. 
        
    
      
        
    
          
  90. 
            6
            

            

                  f.input :quantity
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            6
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    93. 
        
    
      
        
    
          
  93. 
            6
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    94. 
        
    
      
        
    
          
  94. 
            6
            

            

                  f.input :images, as: :file, input_html: { multiple: true }
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

                end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            
          
    97. 
        
    
      
        
    
          
  97. 
            6
            

            

                panel :images do
          
    98. 
        
    
      
        
    
          
  98. 
            6
            

            

                  f.object.images.each do |image|
          
    99. 
        
    
      
        
    
          
  99. 
            1
            

            

                    span image_tag image.variant(resize_to_limit: [100, 100])
          
    100. 
        
    
      
        
    
          
  100. 
            1
            

            

                    span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                                                                                   data: { confirm: "Delete #{image.filename}?" })
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

                  end
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

                end
          
    104. 
        
    
      
        
    
          
  104. 
            
            

            

            
          
    105. 
        
    
      
        
    
          
  105. 
            6
            

            

                f.actions
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

              end
          
    107. 
        
    
      
        
    
          
  107. 
            
            

            

            
          
    108. 
        
    
      
        
    
          
  108. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    109. 
        
    
      
        
    
          
  109. 
            1
            

            

                ActiveStorage::Attachment.find(params[:id]).purge_later
          
    110. 
        
    
      
        
    
          
  110. 
            1
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    111. 
        
    
      
        
    
          
  111. 
            
            

            

              end
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

            end
          
    113.

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Category do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :name, book_ids: []
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              filter :books, collection: Book.all
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :name
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              index do
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                selectable_column
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                column :name
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            3
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            3
            

            

                  row :name
          
    18. 
        
    
      
        
    
          
  18. 
            3
            

            

                  row :created_at
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                  row :updated_at
          
    20. 
        
    
      
        
    
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
          
  20. 
=======
          
  21. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  22. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  23. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  24. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  25. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  26. 
>>>>>>> e54deeb (Featire specs)
=======
          
  27. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  28. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  29. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  30. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  31. 
=======
          
  32. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  33. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  34. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  35. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  36. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  41. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  42. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  43. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  44. 
>>>>>>> a5d032d (Fix)
=======
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  49. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  50. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  51. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  52. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  53. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  54. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

                end
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  55. 
=======
          
  56. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  57. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  58. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  59. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  60. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  61. 
>>>>>>> e54deeb (Featire specs)
=======
          
  62. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  63. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  64. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  66. 
=======
          
  67. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  68. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  69. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  70. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  71. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  72. 
=======
          
  73. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  74. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  75. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  76. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  77. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  78. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  79. 
>>>>>>> a5d032d (Fix)
=======
          
  80. 
=======
          
  81. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  82. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  83. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  84. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  85. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  86. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  87. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  88. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  89. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

              end
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  90. 
=======
          
  91. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  92. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  93. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  94. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  95. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  96. 
>>>>>>> e54deeb (Featire specs)
=======
          
  97. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  98. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  99. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  100. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  101. 
=======
          
  102. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  103. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  104. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  105. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  106. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  107. 
=======
          
  108. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  109. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  110. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  111. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  112. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  113. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  114. 
>>>>>>> a5d032d (Fix)
=======
          
  115. 
=======
          
  116. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  117. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  118. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  119. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  120. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  121. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  122. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  123. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  124. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    125. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  125. 
=======
          
  126. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  127. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  128. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  129. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  130. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  131. 
>>>>>>> e54deeb (Featire specs)
=======
          
  132. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  133. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  134. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  135. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  136. 
=======
          
  137. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  138. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  139. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  140. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  141. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  142. 
=======
          
  143. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  144. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  145. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  146. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  147. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  148. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  149. 
>>>>>>> a5d032d (Fix)
=======
          
  150. 
=======
          
  151. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  152. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  153. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  154. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  155. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  156. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  157. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  158. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  159. 
>>>>>>> 7c4ea7f (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              form do |f|
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
              def show
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
          
    160. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  160. 
            2
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
          
  161. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  162. 
=======
          
  163. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  164. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  165. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  166. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  167. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  168. 
            11
=======
          
  169. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  170. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  171. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  172. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  173. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  174. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  175. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  176. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  177. 
            7
>>>>>>> 4552227 (Featire specs)
=======
          
  178. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
          
  179. 
            15
>>>>>>> 7c4ea7f (Fix)
            

            

                book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  180. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  181. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  182. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                f.inputs do
          
    183. 
        
    
      
        
    
          
  183. 
            2
            

            

                  f.input :name
          
    184. 
        
    
      
        
    
          
  184. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    185. 
        
    
      
        
    
          
  185. 
            
            

            

                end
          
    186. 
        
    
      
        
    
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
          
  186. 
=======
          
  187. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  188. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  189. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  190. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  191. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  192. 
>>>>>>> e54deeb (Featire specs)
=======
          
  193. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  194. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  195. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  196. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  197. 
=======
          
  198. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  199. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  200. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  201. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  202. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
          
  203. 
=======
          
  204. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  205. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  206. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  207. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  208. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  209. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  210. 
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  211. 
=======
          
  212. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  213. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  214. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  215. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  216. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  217. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  218. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  219. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  220. 
            
            

            

            end
          
    221.

app/controllers/checkouts_controller.rb

47.76% lines covered

67 relevant lines. 32 lines covered and 35 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/checkout_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CheckoutsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              before_action :authenticate_user!, only: %i[show update]
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              def new; end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              def create
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                user = User.new(email: permitted_params[:user][:email],
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                                password: Devise.friendly_token.first(Devise.password_length.first))
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                user.skip_confirmation!
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                order = Order.find(session[:order_id])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                if user.save
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  sign_in(:user, user)
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                  user.send_reset_password_instructions
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  order.update(user_id: user.id)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  redirect_to checkout_path(step: :address)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                else
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  redirect_to new_checkout_path, alert: I18n.t('checkout.error_message')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              def show
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                @order = Order.find(session[:order_id]).decorate
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            2
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                @credit_card = CreditCard.find_or_create_by(user_id: current_user.id)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                step = permitted_params[:step]
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                case step
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                when 'initialize' then render 'checkouts/new'
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                when 'delivery' then render 'checkouts/delivery'
          
    37. 
        
    
      
        
    
          
  37. 
            2
            

            

                when 'address' then render 'checkouts/address'
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                when 'payment' then render 'checkouts/payment'
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                when 'confirm' then render 'checkouts/confirm'
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                when 'complete' then render 'checkouts/complete'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                else
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                  render 'checkouts/address'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

              end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              def update
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

                @order = Order.find(session[:order_id]).decorate
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                @credit_card = CreditCard.find_or_create_by(user_id: current_user.id)
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

                case permitted_params[:step]
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                when 'address' then update_address(permitted_params)
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                when 'payment' then update_payment(permitted_params)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                when 'confirm' then update_confirm
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

              end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            1
            

            

              private
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

              def permitted_params
          
    63. 
        
    
      
        
    
          
  63. 
            4
            

            

                params.permit(
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

                  :step, :code,
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone],
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

                  credit_card: %i[name code cvv expiration_date]
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                )
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

              end
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

              def update_address(permitted_params)
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                if permitted_params[:shipping].nil?
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

                  update_billing(permitted_params[:billing])
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                else
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

                  update_shipping(permitted_params[:shipping])
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

                end
          
    78. 
        
    
      
        
    
          
  78. 
            
            

            

              end
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

              def update_shipping(params)
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

                if @user_shipping.update(params)
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

                  redirect_to checkout_path(step: :address), notice: 'Shipping was updated'
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                else
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

                  redirect_to checkout_path(step: :address), alert: CheckoutService.to_errors(@user_shipping.errors.messages)
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

                end
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

              end
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

              def update_billing(params)
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

                if @user_billing.update(params)
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

                  redirect_to checkout_path(step: :address), notice: 'Billing was updated'
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

                else
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

                  redirect_to checkout_path(step: :address), alert: CheckoutService.to_errors(@user_billing.errors.messages)
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

                end
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

              end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

            
          
    96. 
        
    
      
        
    
          
  96. 
            1
            

            

              def update_payment(permitted_params)
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

                if @credit_card.update(permitted_params[:credit_card])
          
    98. 
        
    
      
        
    
          
  98. 
            
            

            

                  redirect_to checkout_path(step: :confirm)
          
    99. 
        
    
      
        
    
          
  99. 
            
            

            

                else
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

                  redirect_to checkout_path(step: :payment), alert: CheckoutService.to_errors(@credit_card.errors.messages)
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                end
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

              end
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

            
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

              def update_confirm
          
    105. 
        
    
      
        
    
          
  105. 
            
            

            

                @order.coupon&.update(is_active: false)
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

            
          
    107. 
        
    
      
        
    
          
  107. 
            
            

            

                if @order.update(status: :created, total_price: count_total_price)
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

                  redirect_to root_path, notice: 'Order was created!'
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

                else
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

                  redirect_to checkout_path(step: :confirm), alert: 'Something went wrong'
          
    111. 
        
    
      
        
    
          
  111. 
            
            

            

                end
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

              end
          
    113. 
        
    
      
        
    
          
  113. 
            
            

            

            
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

              def count_total_price
          
    115. 
        
    
      
        
    
          
  115. 
            
            

            

                product = OrderBook.where(order_id: @order.id)
          
    116. 
        
    
      
        
    
          
  116. 
            
            

            

            
          
    117. 
        
    
      
        
    
          
  117. 
            
            

            

                total_price = product.map do |order|
          
    118. 
        
    
      
        
    
          
  118. 
            
            

            

                  order.book.price_cents * order.quantity
          
    119. 
        
    
      
        
    
          
  119. 
            
            

            

                end.sum
          
    120. 
        
    
      
        
    
          
  120. 
            
            

            

            
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

                total_price *= @order.coupon.discount unless @order.coupon.nil?
          
    122. 
        
    
      
        
    
          
  122. 
            
            

            

            
          
    123. 
        
    
      
        
    
          
  123. 
            
            

            

                total_price + @order.delivery.price_cents
          
    124. 
        
    
      
        
    
          
  124. 
            
            

            

              end
          
    125. 
        
    
      
        
    
          
  125. 
            
            

            

            end
          
    126.

app/controllers/coupons_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CouponsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def find
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                order = Order.find(session[:order_id])
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                coupon&.update(order_id: order.id)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                respond_to do |format|
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  format.json do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                    render json: CouponService.find_coupon(params, order, coupon)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                  end
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                f.actions
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Coupon do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :code, :is_active, :active_till_date, :discount, :order_id
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            ActiveAdmin.register_page 'Dashboard' do
          
    4. 
        
    
      
        
    
          
  4. 
            39
            

            

              menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              action_item only: :show do
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                link_to 'SideKiq View', sidekiq_web_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              content title: proc { I18n.t('active_admin.dashboard') } do
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                div class: 'blank_slate_container', id: 'dashboard_default_message' do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  span class: 'blank_slate' do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                    span I18n.t('active_admin.dashboard_welcome.welcome')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    small I18n.t('active_admin.dashboard_welcome.call_to_action')
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4552227 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
                    }
>>>>>>> 93db8b1 (Featire specs)
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            end
          
    19.

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Order do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :user_id, :coupon_id, :total_price, :status, :last_action
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) <<<<<<< HEAD @book = Book.find(params[:id]).decorate >>>>>>> 715fac2 (Featire specs) ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> ee78f39 (Rebased)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register AdminUser do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :email, :password, :password_confirmation
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                id_column
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :email
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :current_sign_in_at
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :sign_in_count
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :created_at
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                actions
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              filter :email
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              filter :current_sign_in_at
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              filter :sign_in_count
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              filter :created_at
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

<<<<<<< HEAD
              form do |f|
=======
              def show
          
    20. 
        
    
      
        
    
          
  20. 
            7
            

            

                @book = Book.find_by(id: params[:id])
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  23. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
          
  24. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
  25. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            7
            

            

                redirect_to books_path if @book.nil?
>>>>>>> 9bf2aae (Featire specs)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
            
=======
          
  27. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  28. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
          
  29. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
  30. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            7
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                f.inputs do
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                @book = Book.find_by(id: params[:id])
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
    31. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  31. 
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
  32. 
=======
          
  33. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
          
  34. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  35. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
            
            

            

                  f.input :email
          
    36. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  36. 
            
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
  37. 
=======
          
  38. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  39. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  40. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
            7
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
            

            

                  f.input :password
          
    41. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  41. 
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  42. 
=======
          
  43. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
          
  44. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  45. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
            
            

            

                  f.input :password_confirmation
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  46. 
=======
          
  47. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  48. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  49. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

                f.actions
          
    51. 
        
    
      
        
    
          
  51. 
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
          
  52. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
          
  54. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  55. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    56. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  56. 
            
            

            

            end
          
    57.

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Author do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.filters = true
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              permit_params :first_name, :last_name
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :books, collection: Book.all
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              filter :first_name
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :last_name
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              index do
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                selectable_column
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                column :first_name
          
    13. 
        
    
      
        
    
          
  13. 
            3
            

            

                column :last_name
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            3
            

            

                actions
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              show do
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                attributes_table do
          
    20. 
        
    
      
        
    
          
  20. 
            3
            

            

                  row :first_name
          
    21. 
        
    
      
        
    
          
  21. 
            3
            

            

                  row :last_name
          
    22. 
        
    
      
        
    
          
  22. 
            3
            

            

                  row :books
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
                @book = Book.find(params[:id]).decorate
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
                book = Book.find_by(id: params[:id])
=======
                @book = Book.find_by(id: params[:id])
=======
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                book = Book.find(params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  25. 
=======
          
  26. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  27. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  28. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  29. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  30. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  31. 
>>>>>>> e54deeb (Featire specs)
=======
          
  32. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  33. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  34. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  35. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  36. 
=======
          
  37. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  38. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  39. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  40. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  41. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  42. 
=======
          
  43. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  44. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  45. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  46. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  47. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  48. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  49. 
>>>>>>> a5d032d (Fix)
=======
          
  50. 
=======
          
  51. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  52. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  53. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  54. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  55. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  56. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  57. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  58. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  59. 
>>>>>>> 7c4ea7f (Fix)
=======
=======
          
  60. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  61. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
            
            

            

            
          
    62. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  62. 
            1
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
          
  63. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  64. 
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
  65. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  66. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  67. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  68. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  69. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  70. 
            11
=======
          
  71. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  72. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  73. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  74. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  75. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  76. 
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  77. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  78. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  79. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  80. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  81. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  82. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  83. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  84. 
            15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              form do |f|
=======
                if book.nil?
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
                if book.nil?
=======
                redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
          
    85. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  85. 
            2
            

            

                f.inputs do
          
    86. 
        
    
      
        
    
          
  86. 
            2
            

            

                  f.input :first_name
          
    87. 
        
    
      
        
    
          
  87. 
            2
            

            

                  f.input :last_name
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

            
          
    89. 
        
    
      
        
    
          
  89. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

                end
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            2
            

            

                f.actions
          
    93. 
        
    
      
        
    
          
  93. 
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
          
  94. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  95. 
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
  96. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  97. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  98. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  99. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
          
  100. 
            
            

            

                  redirect_to books_path
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                else
          
    102. 
        
    
      
        
    
          
  102. 
            15
            

            

<<<<<<< HEAD
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    103. 
        
    
      
        
    
          
  103. 
            15
            

            

>>>>>>> a5d032d (Fix)
                  @book = book.decorate
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
          
  104. 
=======
          
  105. 
>>>>>>> a5d032d (Fix)
            
            

            

                end
          
    106. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  106. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
          
  107. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
          
  108. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  109. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
          
  110. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  111. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  112. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  113. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  114. 
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
          
  115. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  116. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  117. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
          
  118. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  119. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  120. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  121. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  122. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  123. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  124. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  125. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  126. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    127. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  127. 
            
            

            

            end
          
    128.

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD 51 relevant lines. 51 lines covered and ======= 41 relevant lines. 41 lines covered and >>>>>>> ee78f39 (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Book do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

<<<<<<< HEAD
                            author_ids: [], category_ids: [], images: []
=======
                            category_ids: [], author_ids: []
>>>>>>> ee78f39 (Rebased)
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              decorate_with BookDecorator
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              filter :categories
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              filter :title
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              filter :year_of_publication
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              index do
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
          
  13. 
            6
=======
          
  14. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

                selectable_column
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
          
  16. 
            6
            

            

                column :categories, &:categories_names
          
    17. 
        
    
      
        
    
          
  17. 
            6
=======
          
  18. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

                column :title
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
          
  19. 
            6
=======
          
  20. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
                column :authors, &:authors_names
=======
                column :year_of_publication
>>>>>>> ee78f39 (Rebased)
          
    21. 
        
    
      
        
    
<<<<<<< HEAD
          
  21. 
            6
=======
          
  22. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
                column :description
=======
                column :materials
>>>>>>> ee78f39 (Rebased)
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
          
  23. 
            6
=======
          
  24. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
                column :price, &:price
=======
                column :dimensions
>>>>>>> ee78f39 (Rebased)
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
          
  25. 
            6
=======
          
  26. 
            4
            

            

                column :price_cents, &:price
          
    27. 
        
    
      
        
    
          
  27. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

                column :quantity
          
    28. 
        
    
      
        
    
<<<<<<< HEAD
          
  28. 
            
=======
          
  29. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
            
=======
                column :authors, &:authors_names
>>>>>>> ee78f39 (Rebased)
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
          
  30. 
            6
=======
          
  31. 
            4
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
                actions
=======
                column :categories, &:categories_names
>>>>>>> ee78f39 (Rebased)
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

<<<<<<< HEAD
=======
            
          
    33. 
        
    
      
        
    
          
  33. 
            4
            

            

                actions
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

>>>>>>> ee78f39 (Rebased)
              end
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
  35. 
=======
          
  36. 
>>>>>>> ee78f39 (Rebased)
            
            

            

            
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
          
  37. 
=======
          
  38. 
>>>>>>> ee78f39 (Rebased)
            1
            

            

              show do
          
    39. 
        
    
      
        
    
<<<<<<< HEAD
          
  39. 
            5
=======
          
  40. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                attributes_table do
          
    41. 
        
    
      
        
    
<<<<<<< HEAD
          
  41. 
            5
=======
          
  42. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :authors, &:authors_names
          
    43. 
        
    
      
        
    
<<<<<<< HEAD
          
  43. 
            5
=======
          
  44. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :categories, &:categories_names
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
          
  45. 
            5
=======
          
  46. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :year_of_publication
          
    47. 
        
    
      
        
    
<<<<<<< HEAD
          
  47. 
            5
=======
          
  48. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :description
          
    49. 
        
    
      
        
    
<<<<<<< HEAD
          
  49. 
            5
=======
          
  50. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :materials
          
    51. 
        
    
      
        
    
<<<<<<< HEAD
          
  51. 
            5
=======
          
  52. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :dimensions
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
          
  53. 
            5
=======
          
  54. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :price, &:price
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
          
  55. 
            5
=======
          
  56. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :created_at
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
          
  57. 
            5
=======
          
  58. 
            3
>>>>>>> ee78f39 (Rebased)
            

            

                  row :updated_at
          
    59. 
        
    
      
        
    
<<<<<<< HEAD
          
  59. 
=======
          
  60. 
>>>>>>> ee78f39 (Rebased)
            
            

            

                end
          
    61. 
        
    
      
        
    
<<<<<<< HEAD
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            5
            

            

                panel :images do
          
    63. 
        
    
      
        
    
          
  63. 
            5
            

            

                  table do
          
    64. 
        
    
      
        
    
          
  64. 
            5
            

            

                    book.images.each do |image|
          
    65. 
        
    
      
        
    
          
  65. 
            2
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

                    end
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

                end
          
    69. 
        
    
      
        
    
          
  69. 
=======
          
  70. 
>>>>>>> ee78f39 (Rebased)
            
            

            

              end
          
    71. 
        
    
      
        
    
<<<<<<< HEAD
          
  71. 
=======
          
  72. 
>>>>>>> ee78f39 (Rebased)
            
            

            

            
          
    73. 
        
    
      
        
    
<<<<<<< HEAD
          
  73. 
=======
          
  74. 
>>>>>>> ee78f39 (Rebased)
            1
            

            

              form do |f|
          
    75. 
        
    
      
        
    
<<<<<<< HEAD
          
  75. 
            6
=======
          
  76. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                f.inputs do
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
          
  77. 
            6
=======
          
  78. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                  f.input :title
          
    79. 
        
    
      
        
    
<<<<<<< HEAD
          
  79. 
            6
            

            

                  f.input :description
          
    80. 
        
    
      
        
    
          
  80. 
            6
=======
          
  81. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                  f.input :year_of_publication
          
    82. 
        
    
      
        
    
<<<<<<< HEAD
          
  82. 
            6
=======
          
  83. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                  f.input :price_cents
          
    84. 
        
    
      
        
    
<<<<<<< HEAD
          
  84. 
            6
=======
          
  85. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                  f.input :materials
          
    86. 
        
    
      
        
    
<<<<<<< HEAD
          
  86. 
            6
=======
          
  87. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                  f.input :dimensions
          
    88. 
        
    
      
        
    
<<<<<<< HEAD
          
  88. 
            6
=======
          
  89. 
            2
>>>>>>> ee78f39 (Rebased)
            

            

                  f.input :quantity
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
=======
          
  90. 
            2
            

            

                  f.input :description, as: :text
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            2
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    93. 
        
    
      
        
    
          
  93. 
            2
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

            
          
    96. 
        
    
      
        
    
          
  96. 
            2
            

            

                f.actions
          
    97. 
        
    
      
        
    
>>>>>>> ee78f39 (Rebased)
          
  97. 
            
            

            

<<<<<<< HEAD
            
          
    98. 
        
    
      
        
    
          
  98. 
            6
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    99. 
        
    
      
        
    
          
  99. 
            6
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    100. 
        
    
      
        
    
          
  100. 
            6
            

            

                  f.input :images, as: :file, input_html: { multiple: true }
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                end
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

            
          
    103. 
        
    
      
        
    
          
  103. 
            6
            

            

                panel :images do
          
    104. 
        
    
      
        
    
          
  104. 
            6
            

            

                  f.object.images.each do |image|
          
    105. 
        
    
      
        
    
          
  105. 
            1
            

            

                    span image_tag image.variant(resize_to_limit: [100, 100])
          
    106. 
        
    
      
        
    
          
  106. 
            1
            

            

                    span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
          
    107. 
        
    
      
        
    
          
  107. 
            
            

            

                                                                                   data: { confirm: "Delete #{image.filename}?" })
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

                  end
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

                end
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

            
          
    111. 
        
    
      
        
    
          
  111. 
            6
            

            

                f.actions
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

=======
>>>>>>> ee78f39 (Rebased)
              end
          
    113. 
        
    
      
        
    
<<<<<<< HEAD
          
  113. 
            
            

            

            
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    115. 
        
    
      
        
    
          
  115. 
            1
            

            

                ActiveStorage::Attachment.find(params[:id]).destroy
          
    116. 
        
    
      
        
    
          
  116. 
            1
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    117. 
        
    
      
        
    
          
  117. 
            
            

            

              end
          
    118. 
        
    
      
        
    
          
  118. 
=======
          
  119. 
>>>>>>> ee78f39 (Rebased)
            
            

            

            end
          
    120.

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Category do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :name, book_ids: []
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              filter :books, collection: Book.all
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :name
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              index do
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                selectable_column
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                column :name
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            3
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            3
            

            

                  row :name
          
    18. 
        
    
      
        
    
          
  18. 
            3
            

            

                  row :created_at
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                  row :updated_at
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

              end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              form do |f|
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                f.inputs do
          
    25. 
        
    
      
        
    
          
  25. 
            2
            

            

                  f.input :name
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
          
  28. 
=======
          
  29. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  30. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  31. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  32. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  33. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  34. 
>>>>>>> e54deeb (Featire specs)
=======
          
  35. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  36. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  37. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  38. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  39. 
=======
          
  40. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  41. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  42. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  43. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  44. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  49. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  50. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  51. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  53. 
=======
          
  54. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  55. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  56. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  57. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
  58. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  59. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  60. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  61. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  62. 
            
            

            

            end
          
    63.

app/controllers/checkouts_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CheckoutsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def new; end
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                user = User.new(email: params[:user][:email], password: Devise.friendly_token.first(Devise.password_length.first))
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                user.skip_confirmation!
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                if user.save
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  sign_in(:user, user)
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  user.send_reset_password_instructions
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  redirect_to order_path(session[:order_id])
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                else
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                  redirect_to new_checkout_path, alert: I18n.t('checkout.error_message')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

=======
>>>>>>> aa4fb26 (Add sort orders)
                end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

<<<<<<< HEAD
            end
          
    17.

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CouponsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def find
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                order = Order.find(session[:order_id])
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                respond_to do |format|
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                  format.json do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                    render json: CouponService.find_coupon(params, order, coupon)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 7c4ea7f (Fix)
=======
=======
          
  15. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
                    }
>>>>>>> f5da5ac (Featire specs)
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                f.actions
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            end
          
    19.

app/admin/dashboard.rb

42.86% lines covered

7 relevant lines. 3 lines covered and 4 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            ActiveAdmin.register_page 'Dashboard' do
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
            39
=======
          
  5. 
            31
>>>>>>> ee78f39 (Rebased)
            

            

              menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              content title: proc { I18n.t('active_admin.dashboard') } do
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                div class: 'blank_slate_container', id: 'dashboard_default_message' do
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  span class: 'blank_slate' do
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                    span I18n.t('active_admin.dashboard_welcome.welcome')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                    small I18n.t('active_admin.dashboard_welcome.call_to_action')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

app/controllers/application_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ApplicationController < ActionController::Base
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :user_or_guest_have_order
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              private
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def user_or_guest_have_order
          
    7. 
        
    
      
        
    
          
  7. 
            164
            

            

                if current_user
          
    8. 
        
    
      
        
    
          
  8. 
            36
            

            

                  session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
          
    9. 
        
    
      
        
    
          
  9. 
            36
            

            

                  CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
          
    10. 
        
    
      
        
    
          
  10. 
            128
            

            

                elsif session[:order_id].nil?
          
    11. 
        
    
      
        
    
          
  11. 
            52
            

            

                  session[:order_id] = Order.create.id
          
    12. 
        
    
      
        
    
          
  12. 
            52
            

            

                  CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= 93.75% >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD 93.33% >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 15 relevant lines. 14 lines covered and 1 lines missed. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              def index
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 1677b1a (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> d96cf3b (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
          
  4. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  5. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
              def index
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  6. 
>>>>>>> 93bdda9 (Featire specs)
            24
=======
          
  7. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
          
  8. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  9. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  10. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  11. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
          
  12. 
            25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  13. 
            25
=======
          
  14. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  15. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  16. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  17. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  18. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
          
  19. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  20. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  21. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  22. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  23. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
          
  24. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  25. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  26. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  27. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            

            

                @books_count = Book.count
          
    28. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  28. 
=======
          
  29. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  30. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  31. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
          
  32. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  33. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  34. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  35. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
          
  36. 
            25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  37. 
            25
=======
          
  38. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  39. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  40. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  41. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  42. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
          
  43. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  44. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  45. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  46. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  47. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
          
  48. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  49. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  50. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  51. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            

            

                @categories = Category.all
          
    52. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  52. 
            24
=======
          
  53. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  54. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  55. 
            25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  56. 
            25
=======
          
  57. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  58. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  59. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  60. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  61. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  62. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
          
  63. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  64. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
  65. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
          
    66. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  66. 
            
=======
          
  67. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  68. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  69. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  70. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  71. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  72. 
            
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  73. 
            24
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
          
  74. 
            
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

            
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
          
  76. 
            25
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
                @books = BookDecorator.decorate_collection(sorted_books)
=======
=======
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
              def index
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
          
  77. 
            24
<<<<<<< HEAD
=======
=======
          
  78. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  79. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  80. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  81. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
          
  82. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  83. 
            25
=======
          
  84. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  85. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  86. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  87. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  88. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  89. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  90. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  91. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
          
  92. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
=======
          
  93. 
            25
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
            

            

                @books_count = Book.count
          
    94. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
          
  94. 
            24
<<<<<<< HEAD
=======
=======
          
  95. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  96. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  97. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  98. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
          
  99. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  100. 
            25
=======
          
  101. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  102. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  103. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  104. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  105. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  106. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  107. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  108. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
          
  109. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
=======
          
  110. 
            25
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
            

            

                @categories = Category.all
          
    111. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
          
  111. 
            24
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
          
  112. 
            24
=======
          
  113. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  114. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e50f73e (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  115. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
          
  116. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  117. 
            25
=======
          
  118. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  119. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  120. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  121. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  122. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  123. 
            25
>>>>>>> a5d032d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
          
    124. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  124. 
            
=======
          
  125. 
            24
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  126. 
            24
>>>>>>> 752f0c0 (Featire specs)
=======
          
  127. 
            24
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  128. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  129. 
            24
>>>>>>> 7a02bbe (Featire specs)
=======
          
  130. 
            
>>>>>>> a5d032d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                                                per_page: PAGINATION_PER_PAGE)
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> b28889f (Fix)
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
          
    131. 
        
    
      
        
    
          
  131. 
            
            

            

            
          
    132. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
          
  132. 
            25
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
=======
>>>>>>> cb74525 (Add login registration pages)
              def index
          
    133. 
        
    
      
        
    
          
  133. 
            25
            

            

                @books_count = Book.count
          
    134. 
        
    
      
        
    
          
  134. 
            25
            

            

                @categories = Category.all
          
    135. 
        
    
      
        
    
          
  135. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
          
  136. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
          
  137. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
          
  138. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
          
  139. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  140. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  141. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
            

            

                sorted_books = BookQuery.query(params).paginate(page: params[:page],
          
    142. 
        
    
      
        
    
<<<<<<< HEAD
          
  142. 
=======
          
  143. 
>>>>>>> cb74525 (Add login registration pages)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                                                                per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
          
    144. 
        
    
      
        
    
          
  144. 
            
            

            

            
          
    145. 
        
    
      
        
    
          
  145. 
            25
            

            

                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> ee78f39 (Rebased)
=======
                                                                per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
          
    146. 
        
    
      
        
    
          
  146. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
  147. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  148. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  149. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
            
            

            

            
          
    150. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  150. 
=======
          
  151. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  152. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  153. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  154. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  155. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  156. 
            24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  157. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  158. 
            24
<<<<<<< HEAD
=======
=======
          
  159. 
            25
>>>>>>> df37394 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  160. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  161. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  162. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
>>>>>>> d96cf3b (Featire specs)
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
    163. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  163. 
=======
=======
          
  164. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  165. 
=======
>>>>>>> d96cf3b (Featire specs)
          
  166. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  167. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  168. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  169. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  170. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
            
            

            

            
          
    171. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  171. 
=======
          
  172. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  173. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  174. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  175. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  176. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  177. 
            25
>>>>>>> aca90e3 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
          
  178. 
            24
<<<<<<< HEAD
=======
=======
          
  179. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  180. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  181. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
=======
          
  182. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
          
  183. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> cb74525 (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  184. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  185. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  186. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
=======
          
  187. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  188. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  189. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  190. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
            

            

<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
    191. 
        
    
      
        
    
<<<<<<< HEAD
          
  191. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  192. 
=======
          
  193. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  194. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  195. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            
          
    196. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  196. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
          
  197. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
          
  198. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  199. 
            24
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
          
  200. 
            25
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
          
  201. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
          
  202. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  203. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
          
  204. 
            25
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  205. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
          
  206. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
          
  207. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
          
  208. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
          
  209. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  210. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  211. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  212. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  213. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
=======
          
  214. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
          
  215. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
            

            

                @books = BookDecorator.decorate_collection(sorted_books)
          
    216. 
        
    
      
        
    
          
  216. 
            
            

            

            
          
    217. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  217. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  218. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  219. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  220. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  221. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  222. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  223. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
          
  224. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
  225. 
            25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  226. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  227. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  228. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
          
  229. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            

            

                respond_to do |format|
          
    230. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  230. 
=======
          
  231. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  232. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  233. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  234. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  235. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  236. 
            25
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  237. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  238. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  239. 
            24
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  240. 
            24
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
=======
          
  241. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  242. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  243. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  244. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
          
  245. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  246. 
            25
=======
          
  247. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  248. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  249. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  250. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  251. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
          
  252. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  253. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  254. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  255. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  256. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  257. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  258. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
          
  259. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  260. 
            25
=======
          
  261. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
          
  262. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
          
  263. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
          
  264. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
          
  265. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  266. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  267. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  268. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
          
  269. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            

            

                  format.html
          
    270. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  270. 
=======
          
  271. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  272. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  273. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  274. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  275. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  276. 
            25
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  277. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  278. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  279. 
            24
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  280. 
            24
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
=======
          
  281. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  282. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  283. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  284. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
          
  285. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  286. 
            25
=======
          
  287. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  288. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  289. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  290. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  291. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
          
  292. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  293. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  294. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  295. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  296. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  297. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  298. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
          
  299. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  300. 
            25
=======
          
  301. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
          
  302. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
          
  303. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
          
  304. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
          
  305. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  306. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  307. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  308. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
          
  309. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            

            

                  format.json do
          
    310. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  310. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  311. 
=======
          
  312. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  313. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  314. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  315. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  316. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  317. 
>>>>>>> e54deeb (Featire specs)
=======
          
  318. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  319. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  320. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  321. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  322. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  323. 
=======
          
  324. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  325. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  326. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  327. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  328. 
=======
          
  329. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  330. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  331. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  332. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  333. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  334. 
=======
          
  335. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  336. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  337. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  338. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  339. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  340. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  341. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  342. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  343. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  344. 
=======
          
  345. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  346. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  347. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  348. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  349. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  350. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  351. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  352. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  353. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            1
            

            

                    render json: {
          
    354. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  354. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  355. 
=======
          
  356. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  357. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  358. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  359. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  360. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  361. 
>>>>>>> e54deeb (Featire specs)
=======
          
  362. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  363. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  364. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  365. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  366. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  367. 
=======
          
  368. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  369. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  370. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  371. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  372. 
=======
          
  373. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  374. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  375. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  376. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  377. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  378. 
=======
          
  379. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  380. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  381. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  382. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  383. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  384. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  385. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  386. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  387. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  388. 
=======
          
  389. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  390. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  391. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  392. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  393. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  394. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  395. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  396. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  397. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            
            

            

                      entries: render_to_string(partial: 'books/index/books', formats: [:html]),
          
    398. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  398. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  399. 
=======
          
  400. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  401. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  402. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  403. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  404. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  405. 
>>>>>>> e54deeb (Featire specs)
=======
          
  406. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  407. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  408. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  409. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  410. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  411. 
=======
          
  412. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  413. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  414. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  415. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  416. 
=======
          
  417. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  418. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  419. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  420. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  421. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  422. 
=======
          
  423. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  424. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  425. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  426. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  427. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  428. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  429. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  430. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  431. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  432. 
=======
          
  433. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  434. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  435. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  436. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  437. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  438. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  439. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  440. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  441. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            
            

            

                      pagination: view_context.will_paginate(@books)
          
    442. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  442. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  443. 
=======
          
  444. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  445. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  446. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  447. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  448. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  449. 
>>>>>>> e54deeb (Featire specs)
=======
          
  450. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  451. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  452. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  453. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  454. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  455. 
=======
          
  456. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  457. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  458. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  459. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  460. 
=======
          
  461. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  462. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  463. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  464. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  465. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  466. 
=======
          
  467. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  468. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  469. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  470. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  471. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  472. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  473. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  474. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  475. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  476. 
=======
          
  477. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  478. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  479. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  480. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  481. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  482. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  483. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  484. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  485. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            
            

            

=======
<<<<<<< HEAD
=======
>>>>>>> d6f7da8 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 78d0719 (Featire specs)
                    }
          
    486. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  486. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  487. 
=======
          
  488. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  489. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  490. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  491. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  492. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  493. 
>>>>>>> e54deeb (Featire specs)
=======
          
  494. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  495. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  496. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  497. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  498. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  499. 
=======
          
  500. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  501. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  502. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  503. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  504. 
=======
          
  505. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  506. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  507. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  508. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  509. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  510. 
=======
          
  511. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  512. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  513. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  514. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  515. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  516. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  517. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  518. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  519. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  520. 
=======
          
  521. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  522. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  523. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  524. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  525. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  526. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  527. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  528. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  529. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  530. 
>>>>>>> d6f7da8 (Featire specs)
=======
          
  531. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  532. 
>>>>>>> 78d0719 (Featire specs)
            
            

            

                  end
          
    533. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  533. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  534. 
=======
          
  535. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  536. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  537. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  538. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  539. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  540. 
>>>>>>> e54deeb (Featire specs)
=======
          
  541. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  542. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  543. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  544. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  545. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  546. 
=======
          
  547. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  548. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  549. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  550. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  551. 
=======
          
  552. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  553. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  554. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  555. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  556. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  557. 
=======
          
  558. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  559. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  560. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  561. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  562. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  563. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  564. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  565. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  566. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  567. 
=======
          
  568. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  569. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  570. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  571. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  572. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  573. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  574. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  575. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  576. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  577. 
>>>>>>> d6f7da8 (Featire specs)
=======
          
  578. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  579. 
>>>>>>> 78d0719 (Featire specs)
            
            

            

                end
          
    580. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  580. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  581. 
=======
          
  582. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  583. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  584. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  585. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  586. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  587. 
>>>>>>> e54deeb (Featire specs)
=======
          
  588. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  589. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  590. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  591. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  592. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  593. 
=======
          
  594. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  595. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  596. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  597. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  598. 
=======
          
  599. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  600. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  601. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  602. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  603. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  604. 
=======
          
  605. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  606. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  607. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  608. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  609. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  610. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  611. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  612. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  613. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  614. 
=======
          
  615. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  616. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  617. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  618. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  619. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  620. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  621. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  622. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  623. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  624. 
>>>>>>> d6f7da8 (Featire specs)
=======
          
  625. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  626. 
>>>>>>> 78d0719 (Featire specs)
            
            

            

              end
          
    627. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  627. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  628. 
=======
          
  629. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  630. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  631. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  632. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  633. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  634. 
>>>>>>> e54deeb (Featire specs)
=======
          
  635. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  636. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  637. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  638. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  639. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  640. 
=======
          
  641. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  642. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  643. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  644. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  645. 
=======
          
  646. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  647. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  648. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  649. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  650. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  651. 
=======
          
  652. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  653. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  654. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  655. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  656. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  657. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  658. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  659. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  660. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  661. 
=======
          
  662. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  663. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  664. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  665. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  666. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  667. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  668. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  669. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  670. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  671. 
>>>>>>> d6f7da8 (Featire specs)
=======
          
  672. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  673. 
>>>>>>> 78d0719 (Featire specs)
            
            

            

            
          
    674. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  674. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  675. 
=======
          
  676. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  677. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  678. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  679. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  680. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  681. 
>>>>>>> e54deeb (Featire specs)
=======
          
  682. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  683. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  684. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  685. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  686. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  687. 
=======
          
  688. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  689. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  690. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  691. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  692. 
=======
          
  693. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  694. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  695. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  696. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  697. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  698. 
=======
          
  699. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  700. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  701. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  702. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  703. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  704. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  705. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  706. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  707. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  708. 
=======
          
  709. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  710. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  711. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  712. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  713. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  714. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  715. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  716. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  717. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  718. 
>>>>>>> d6f7da8 (Featire specs)
=======
          
  719. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  720. 
>>>>>>> 78d0719 (Featire specs)
            1
            

            

              def show
          
    721. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  721. 
            11
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  722. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  723. 
=======
          
  724. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  725. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  726. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  727. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  728. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  729. 
            11
=======
          
  730. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  731. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  732. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
          
  733. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
<<<<<<< HEAD
          
  734. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  735. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  736. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  737. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  738. 
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  739. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  740. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  741. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  742. 
            7
>>>>>>> 4552227 (Featire specs)
=======
          
  743. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
          
  744. 
            15
>>>>>>> 7c4ea7f (Fix)
=======
          
  745. 
            7
>>>>>>> d6f7da8 (Featire specs)
=======
          
  746. 
            7
>>>>>>> dacfb20 (Featire specs)
=======
          
  747. 
            7
>>>>>>> 78d0719 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  748. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  749. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  750. 
            11
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @book = Book.find(params[:id]).decorate
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  751. 
=======
          
  752. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  753. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  754. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  755. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  756. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
          
  757. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  758. 
            11
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                book = Book.find_by(id: params[:id])
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
=======
                @book = Book.find(params[:id]).decorate
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @book = Book.find(params[:id]).decorate
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
                book = Book.find_by(id: params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                book = Book.find(params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
                @book = Book.find_by(id: params[:id])
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> dacfb20 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 78d0719 (Featire specs)
          
    759. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  759. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  760. 
=======
          
  761. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  762. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  763. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  764. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  765. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  766. 
>>>>>>> e54deeb (Featire specs)
=======
          
  767. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  768. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  769. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  770. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  771. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  772. 
=======
          
  773. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  774. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  775. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  776. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  777. 
=======
          
  778. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  779. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  780. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  781. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  782. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  783. 
=======
          
  784. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  785. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  786. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  787. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  788. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  789. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  790. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  791. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  792. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
          
  793. 
=======
          
  794. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  795. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  796. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  797. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  798. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  799. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  800. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  801. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  802. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  803. 
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
          
  804. 
=======
          
  805. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
          
  806. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
          
  807. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
          
  808. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  809. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
          
  810. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  811. 
>>>>>>> 78d0719 (Featire specs)
            
            

            

            
          
    812. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  812. 
            11
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  813. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  814. 
=======
          
  815. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  816. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  817. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  818. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  819. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  820. 
            11
=======
          
  821. 
            11
>>>>>>> 9620751 (Featire specs)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
          
  822. 
=======
          
  823. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  824. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  825. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  826. 
>>>>>>> 4552227 (Featire specs)
=======
          
  827. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  828. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  829. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  830. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  831. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  832. 
=======
          
  833. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  834. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  835. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  836. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  837. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
          
  838. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  839. 
            11
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  840. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  841. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  842. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  843. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  844. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  845. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  846. 
            15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  847. 
            7
>>>>>>> d6f7da8 (Featire specs)
=======
          
  848. 
            7
>>>>>>> dacfb20 (Featire specs)
=======
          
  849. 
            7
>>>>>>> 78d0719 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                if book.nil?
=======
                redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
                if book.nil?
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
                redirect_to books_path if @book.nil?
>>>>>>> d6f7da8 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> dacfb20 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 78d0719 (Featire specs)
          
    850. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
  850. 
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
          
  851. 
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  852. 
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
          
  853. 
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  854. 
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
          
  855. 
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  856. 
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
          
  857. 
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
          
  858. 
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
          
  859. 
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
          
  860. 
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
          
  861. 
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  862. 
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
          
  863. 
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  864. 
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
          
  865. 
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
          
  866. 
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
          
  867. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  868. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
          
  869. 
            
            

            

                  redirect_to books_path
          
    870. 
        
    
      
        
    
          
  870. 
            
            

            

                else
          
    871. 
        
    
      
        
    
          
  871. 
            15
            

            

<<<<<<< HEAD
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    872. 
        
    
      
        
    
          
  872. 
            15
            

            

>>>>>>> a5d032d (Fix)
                  @book = book.decorate
          
    873. 
        
    
      
        
    
<<<<<<< HEAD
          
  873. 
=======
          
  874. 
>>>>>>> a5d032d (Fix)
            
            

            

                end
          
    875. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  875. 
<<<<<<< HEAD
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
          
  876. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
  877. 
=======
          
  878. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  879. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  880. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  881. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> ee78f39 (Rebased)
          
  882. 
            
            

            

                  redirect_to books_path
          
    883. 
        
    
      
        
    
          
  883. 
            
            

            

                else
          
    884. 
        
    
      
        
    
          
  884. 
            11
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    885. 
        
    
      
        
    
          
  885. 
            11
            

            

>>>>>>> a5d032d (Fix)
=======
>>>>>>> ee78f39 (Rebased)
                  @book = book.decorate
          
    886. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  886. 
=======
          
  887. 
>>>>>>> a5d032d (Fix)
=======
          
  888. 
>>>>>>> ee78f39 (Rebased)
            
            

            

                end
          
    889. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  889. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  890. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  891. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  892. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
          
  893. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  894. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
          
  895. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  896. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  897. 
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
          
  898. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  899. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
          
  900. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  901. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  902. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
          
  903. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  904. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  905. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  906. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  907. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  908. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  909. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  910. 
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
          
  911. 
=======
          
  912. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
          
  913. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
          
  914. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
          
  915. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  916. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
          
  917. 
>>>>>>> dacfb20 (Featire specs)
=======
          
  918. 
>>>>>>> 78d0719 (Featire specs)
            
            

            

              end
          
    919. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  919. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  920. 
=======
          
  921. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  922. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  923. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  924. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  925. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  926. 
>>>>>>> e54deeb (Featire specs)
=======
          
  927. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  928. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  929. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  930. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  931. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  932. 
=======
          
  933. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  934. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  935. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  936. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  937. 
=======
          
  938. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  939. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  940. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  941. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  942. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
          
  943. 
=======
          
  944. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  945. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  946. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  947. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  948. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  949. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  950. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  951. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  952. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  953. 
=======
          
  954. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  955. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  956. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  957. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  958. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  959. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  960. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  961. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  962. 
            
            

            

            end
          
    963.

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CouponsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def find
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                order = Order.find(session[:order_id])
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                respond_to do |format|
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                  format.json do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                    render json: CouponService.find_coupon(params, order, coupon)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            
            

            

=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
          
  15. 
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  19. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
=======
          
  20. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d7fadcd (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 78d0719 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  21. 
=======
          
  22. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  23. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  24. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  25. 
>>>>>>> 4552227 (Featire specs)
=======
          
  26. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 5f76842 (Featire specs)
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> aa4fb26 (Add sort orders)
            end
          
    27.

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class HomeController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def index
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
  3. 
            13
=======
          
  4. 
            3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  5. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  6. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  7. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  8. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  9. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  10. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  11. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  12. 
            13
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  13. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  14. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  15. 
            13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
          
  16. 
            13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  17. 
            18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  18. 
            13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  19. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  20. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  21. 
            13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  22. 
            18
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
          
  23. 
            18
=======
          
  24. 
            3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
          
  25. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
          
  26. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
          
  27. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
          
  28. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  29. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
          
  30. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  31. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
          
  32. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  33. 
            18
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> e5752db (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 5506bd0 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> df37394 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 715fac2 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 3dc272d (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 78d0719 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
  34. 
            13
=======
          
  35. 
            3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  36. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  37. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  38. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  39. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  40. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  41. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  42. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  43. 
            13
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  44. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  45. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  46. 
            13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
          
  47. 
            13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  48. 
            18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  49. 
            13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  50. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  51. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  52. 
            13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  53. 
            18
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
          
  54. 
            18
=======
          
  55. 
            3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
          
  56. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
          
  57. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
          
  58. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
          
  59. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  60. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
          
  61. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  62. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
          
  63. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  64. 
            18
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                @best_sellers = best_sellers
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

              end
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

            
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

              private
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

              def best_sellers
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
          
  70. 
            13
=======
          
  71. 
            3
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
          
  72. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  73. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
          
  74. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
          
  75. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  76. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  77. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  78. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  79. 
            13
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  80. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  81. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  82. 
            13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
          
  83. 
            13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  84. 
            18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  85. 
            13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  86. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  87. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  88. 
            13
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  89. 
            18
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> e5752db (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> df37394 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 715fac2 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 3dc272d (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                BookDecorator.decorate_collection(Book.first(4))
=======
                Book.first(4)
>>>>>>> 752f0c0 (Featire specs)
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
=======
                Book.first(4)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                Book.first(4)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 64d4167 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 13fd74f (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> a038b16 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> d7fadcd (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

              end
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            end
          
    92.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 75be480 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)

app/controllers/order_books_controller.rb

82.86% lines covered

35 relevant lines. 29 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../services/book_service'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            class OrderBooksController < ApplicationController
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              before_action :update_order_last_action
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def add_to_order
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                respond_to do |format|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  format.html
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  format.json do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                    if product.save
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                      render json: { notice: 'Added!' }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    else
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                      render json: { notice: 'Error!' }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              def delete_product
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                if product.destroy
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  redirect_to orders_path, notice: I18n.t('order.messages.delete')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                else
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              def update_quantity
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                book = Book.find(params[:book_id])
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                order = Order.find(params[:order_id])
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            2
            

            

                respond_to do |format|
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  format.html
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  format.json do
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                    render json: BookService.quantity_update(params, product, order, book, coupon)
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                  end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

              end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

              def update
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                product = OrderBook.find_by(order_id: session[:order_id], book_id: params[:book_id])
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                product.update(quantity: params[:quantity])
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

                redirect_to orders_path
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

              end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

              private
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

              def order_item_params
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                params.permit(%i[book_id quantity order_id])
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

              def update_order_last_action
          
    60. 
        
    
      
        
    
          
  60. 
            7
            

            

                Order.find(session[:order_id]).update(last_action: DateTime.now)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

app/controllers/orders_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class OrdersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def index
          
    3. 
        
    
      
        
    
          
  3. 
            12
            

            

                @cart = Order.find(session[:order_id]).decorate
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

              end
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def show
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

                if current_user
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  @order = Order.find_by(id: session[:order_id], user_id: current_user.id).decorate
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  render 'orders/show'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                else
          
    11. 
        
    
      
        
    
          
  11. 
            3
            

            

                  redirect_to new_checkout_path
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.
>>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> eaef86a (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                  redirect_to book_path(@review.book), notice: I18n.t('review.success')
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                else
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              private
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              def review_params
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD

app/controllers/order_books_controller.rb

80.65% lines covered

31 relevant lines. 25 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../services/book_service'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            class OrderBooksController < ApplicationController
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              before_action :update_order_last_action
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def add_to_order
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                respond_to do |format|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  format.html
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  format.json do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                    if product.save
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                      render json: { notice: 'Added!' }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    else
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                      render json: { notice: 'Error!' }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              def delete_product
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                if product.destroy
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                  redirect_to orders_path, notice: I18n.t('order.messages.delete')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                else
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              def update_quantity
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                book = Book.find(params[:book_id])
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                order = Order.find(params[:order_id])
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            2
            

            

                respond_to do |format|
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  format.html
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  format.json do
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                    render json: BookService.quantity_update(params, product, order, book, coupon)
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                  end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

              end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

              private
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              def order_item_params
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                params.permit(%i[book_id quantity order_id])
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

              def update_order_last_action
          
    52. 
        
    
      
        
    
          
  52. 
            6
            

            

                Order.find(session[:order_id]).update(last_action: DateTime.now)
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

              end
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            end
          
    55.

app/controllers/orders_controller.rb

======= ======= =======
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)

app/decorators/author_decorator.rb

<<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3dc272d (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> 3dc272d (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              private
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              def review_params
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class OrdersController < ApplicationController
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class AuthorDecorator < Draper::Decorator
=======
            module ApplicationHelper
>>>>>>> 752f0c0 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
            module ApplicationHelper
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
            module ApplicationHelper
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              def index
          
    3. 
        
    
      
        
    
          
  3. 
            7
            

            

                @cart = Order.find(session[:order_id]).decorate
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

              end
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def registration_without_password; end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
>>>>>>> 7c4ea7f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                  redirect_to book_path(@review.book), notice: I18n.t('review.success')
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                else
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              private
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              def review_params
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 96394f1 (Featire specs) ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              private
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              def review_params
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)

app/controllers/order_books_controller.rb

82.86% lines covered

35 relevant lines. 29 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../services/book_service'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            class OrderBooksController < ApplicationController
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              before_action :update_order_last_action
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def add_to_order
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                respond_to do |format|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  format.html
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  format.json do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                    if product.save
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                      render json: { notice: 'Added!' }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    else
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                      render json: { notice: 'Error!' }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              def delete_product
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                if product.destroy
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  redirect_to order_path(session[:order_id]), notice: I18n.t('order.messages.delete')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                else
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  redirect_to order_path(session[:order_id]), alert: I18n.t('order.errors.error_delete')
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              def update_quantity
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                book = Book.find(params[:book_id])
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                order = Order.find(params[:order_id])
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            2
            

            

                respond_to do |format|
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  format.html
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  format.json do
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                    render json: BookService.quantity_update(params, product, order, book, coupon)
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                  end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

              end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

              def update
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                product = OrderBook.find_by(order_id: session[:order_id], book_id: params[:book_id])
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                product.update(quantity: params[:quantity])
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

                redirect_to orders_path
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

              end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

              private
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

              def order_item_params
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                params.permit(%i[book_id quantity order_id])
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

              def update_order_last_action
          
    60. 
        
    
      
        
    
          
  60. 
            7
            

            

                Order.find(session[:order_id]).update(updated_at: DateTime.now)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

app/controllers/orders_controller.rb

33.33% lines covered

33 relevant lines. 11 lines covered and 22 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../queries/order_query'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            class OrdersController < ApplicationController
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              before_action :authenticate_user!, only: %i[update index]
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def show
          
    5. 
        
    
      
        
    
          
  5. 
            13
            

            

                @cart = Order.find(session[:order_id]).decorate
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              def index
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                @orders = OrderQuery.query(params, current_user)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              def update
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                order = Order.find(params[:id])
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                if params[:order][:delivery_id]
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  update_delivery_method(params[:order][:delivery_id], order)
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                elsif params[:order][:address_id]
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  update_address(params[:order][:address_id], order)
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                elsif params[:order][:billing] || params[:order][:shipping]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  update_user_address(params[:order])
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              private
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              def update_delivery_method(delivery_id, order)
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                method = Delivery.find(delivery_id)
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                redirect_to checkout_path(step: :delivery), alert: 'No method found!' if order.nil? && method.nil?
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                if order.update(delivery_id: method.id)
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  redirect_to checkout_path(step: :payment)
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                else
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  redirect_to checkout_path(step: :delivery)
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

              end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

              def update_address(address_id, order)
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                address = Address.find(address_id)
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                redirect_to checkout_path(step: :address), alert: 'No address found!' if order.nil? && address.nil?
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                if order.update(address_id: address.id)
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                  redirect_to checkout_path(step: :delivery)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                else
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                  redirect_to checkout_path(step: :address)
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

                end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

              end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

              def update_user_address(permitted_params)
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                if permitted_params[:shipping].nil?
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

                  current_user.billing.update(permitted_params[:billing])
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

                else
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                  current_user.shipping.update(permitted_params[:shipping])
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                redirect_to checkout_path(step: :address)
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

              end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            end
          
    60.
>>>>>>> 7c4ea7f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                  redirect_to book_path(@review.book), notice: I18n.t('review.success')
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                else
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              private
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              def review_params
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.

app/controllers/users_controller.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if session[:previous_path].eql?('/checkout')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                  redirect_to checkout_path(step: 'address'), notice: I18n.t('settings.message.update') if updated? update_user
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  redirect_to checkout_path(step: 'address'), alert: I18n.t('settings.erorr.error') unless updated? update_user
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                else
          
    17. 
        
    
      
        
    
          
  17. 
            5
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update') if updated? update_user
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            5
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.error.error') unless updated? update_user
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

              end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              def destroy
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                current_user.destroy
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

              private
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

              def updated?(update_user)
          
    31. 
        
    
      
        
    
          
  31. 
            10
            

            

                return true if update_user.success?
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                false
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

              def permitted_params
          
    37. 
        
    
      
        
    
          
  37. 
            5
            

            

                params.permit(
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                )
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

              end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            end
          
    44.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD <<<<<<< HEAD ======= =======
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              private
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              def review_params
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price)
======= >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= =======
>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= =======
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1a9aba9 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 8577deb (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 8577deb (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class AuthorDecorator < Draper::Decorator
=======
            module ApplicationHelper
>>>>>>> 752f0c0 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b15044a (Manifest_cache true)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
            module ApplicationHelper
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
              delegate_all
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def full_name
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

                "#{first_name} #{last_name}"
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/book_decorator.rb

100.0% lines covered

<<<<<<< HEAD 10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              decorates_association :authors
>>>>>>> 998f08d (Manifest_cache true)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
          
  3. 
=======
          
  4. 
            1
            

            

              decorates_association :categories
          
    5. 
        
    
      
        
    
          
  5. 
>>>>>>> 4552227 (Featire specs)
            
            

            

            
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
          
  6. 
=======
          
  7. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
              def full_name
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  8. 
            2
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
  9. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  10. 
            2
=======
<<<<<<< HEAD
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
          
  11. 
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
          
  12. 
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  13. 
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
          
  14. 
            3
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
          
  15. 
            3
>>>>>>> b8aab1a (Manifest_cache true)
>>>>>>> 04108c4 (Manifest_cache true)
=======
          
  16. 
            2
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  17. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5f76842 (Featire specs)
          
  18. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
  19. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  20. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  21. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
          
  22. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
          
  23. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  24. 
            3
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> a77cc8a (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  25. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  26. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  27. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  28. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  29. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
          
  30. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  31. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> ea0650c (Featire specs)
=======
=======
          
  32. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  33. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
          
  34. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
          
  35. 
            2
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
          
  36. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  37. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  38. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  39. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  40. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
          
  41. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
            

            

                "#{first_name} #{last_name}"
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4552227 (Featire specs)
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

<<<<<<< HEAD
              end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            end
          
    44.

app/decorators/book_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b746b60 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 0b5b269 (Fix) ======= 100.0% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= 90.0% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 49e3b70 (Fix) ======= 100.0% >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 90.0% >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= 90.0% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. <<<<<<< HEAD >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 39467b5 (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 94d9078 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> 2956182 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 12 relevant lines. 12 lines covered and ======= 10 relevant lines. <<<<<<< HEAD 10 lines covered and >>>>>>> 7375d4b (Manifest_cache true) 0 lines missed. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            require 'monetize'
=======
            class BookDecorator < Draper::Decorator
>>>>>>> cde4834 (Manifest_cache true)
=======
            require 'monetize'
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 587ce47 (Manifest_cache true)
            require 'monetize'
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
            require 'monetize'
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
            require 'monetize'
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
            require 'monetize'
>>>>>>> 49e3b70 (Fix)
=======
            require 'monetize'
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
=======
            require 'monetize'
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
=======
          
  3. 
            1
=======
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
          
  4. 
            
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 1830ff1 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
          
  5. 
            
=======
          
  6. 
            
>>>>>>> b459807 (Manifest_cache true)
=======
          
  7. 
            
>>>>>>> caaaa41 (Manifest_cache true)
=======
          
  8. 
            
>>>>>>> ed97c39 (Manifest_cache true)
=======
          
  9. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
          
  10. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
          
  11. 
            
>>>>>>> d52ad35 (Rebased)
=======
          
  12. 
            
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  13. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  14. 
            
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
          
  15. 
            
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
          
  16. 
            
=======
          
  17. 
            
>>>>>>> b746b60 (Manifest_cache true)
=======
          
  18. 
            
>>>>>>> d8298a1 (Manifest_cache true)
=======
          
  19. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
          
  20. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
          
  21. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
          
  22. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
          
  23. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
          
  24. 
            
>>>>>>> 1ac6be1 (Fix)
=======
          
  25. 
            1
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  26. 
            
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
          
  27. 
            
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
          
  28. 
            
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
          
  29. 
            
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
              decorates_association :authors
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
>>>>>>> aa7b40c (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
            
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
            
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
            
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
            
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> ed97c39 (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
            
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdea3aa (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e2d040a (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> d7fadcd (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
            
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
              decorates_association :authors
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
            
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
            
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
            
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
            
=======
              decorates_association :authors
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
              decorates_association :authors
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
            
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
              decorates_association :categories
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :categories
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
            class BookDecorator < Draper::Decorator
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
=======
>>>>>>> 3dc272d (Featire specs)
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
              decorates_association :categories
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
=======
              decorates_association :categories
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
              PAGINATION_PER_PAGE = 12
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
              decorates_association :categories
>>>>>>> cde4834 (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
          
    31. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  31. 
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  32. 
            1
            

            

              decorates_association :authors
          
    33. 
        
    
      
        
    
          
  33. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  34. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  35. 
=======
          
  36. 
>>>>>>> ee78f39 (Rebased)
=======
          
  37. 
>>>>>>> 836a973 (Rebased)
=======
          
  38. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  39. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class BookDecorator < Draper::Decorator
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
            class BookDecorator < Draper::Decorator
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
              decorates_association :categories
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
              decorates_association :categories
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
              decorates_association :categories
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
=======
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
              decorates_association :categories
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
              decorates_association :categories
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
              decorates_association :categories
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
              decorates_association :categories
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
              decorates_association :categories
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

              decorates_association :authors
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
          
  42. 
            1
            

            

<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
              def self.collection_decorator_class
          
    43. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
          
  43. 
            
=======
<<<<<<< HEAD
          
  44. 
            30
=======
          
  45. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
          
  46. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  47. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  48. 
            31
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  49. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  50. 
            30
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
            56
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  52. 
            31
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  53. 
            56
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
=======
          
  54. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> eaef86a (Fix)
=======
          
  55. 
            58
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
          
  56. 
            58
=======
<<<<<<< HEAD
          
  57. 
            30
=======
          
  58. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 49e3b70 (Fix)
=======
          
  59. 
            68
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
          
  60. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  61. 
            68
=======
<<<<<<< HEAD
          
  62. 
            30
=======
          
  63. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
          
  64. 
            68
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                PaginatingDecorator
          
    65. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  65. 
=======
          
  66. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

              end
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
          
  67. 
=======
=======
>>>>>>> 1577aeb (Rebased)
          
  68. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

              end
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

            
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  70. 
=======
          
  71. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  72. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

              delegate_all
          
    73. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  73. 
=======
          
  74. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  75. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
=======
          
  77. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  78. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

              def authors_names
          
    79. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
          
  79. 
            1
=======
<<<<<<< HEAD
          
  80. 
            89
=======
          
  81. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
          
  82. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  83. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  84. 
            90
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  85. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  86. 
            89
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  87. 
            101
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  88. 
            90
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  89. 
            101
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
=======
          
  90. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> eaef86a (Fix)
=======
          
  91. 
            105
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
=======
          
  92. 
            109
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
          
  93. 
            109
=======
          
  94. 
            109
>>>>>>> b8aab1a (Manifest_cache true)
=======
<<<<<<< HEAD
          
  95. 
            89
=======
          
  96. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 49e3b70 (Fix)
=======
          
  97. 
            109
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
          
  98. 
            1
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
          
  99. 
            109
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                authors.map(&:full_name).join(', ')
          
    100. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  100. 
=======
          
  101. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

              end
          
    102. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  102. 
=======
=======
>>>>>>> 1577aeb (Rebased)
          
  103. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

              end
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  104. 
=======
          
  105. 
>>>>>>> cde4834 (Manifest_cache true)
            1
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
          
  106. 
            
>>>>>>> 1577aeb (Rebased)
            

            

            
          
    107. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  107. 
            12
=======
          
  108. 
            8
>>>>>>> ee78f39 (Rebased)
=======
          
  109. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  110. 
            12
>>>>>>> 872e675 (Fix)
=======
          
  111. 
            8
>>>>>>> 836a973 (Rebased)
=======
          
  112. 
            
>>>>>>> 078304c (Rebased)
=======
          
  113. 
            12
>>>>>>> d15fe1d (Fix)
            

            

<<<<<<< HEAD
=======
              def categories_names
          
    114. 
        
    
      
        
    
          
  114. 
            12
            

            

>>>>>>> 1577aeb (Rebased)
                categories.pluck(:name).join(', ')
          
    115. 
        
    
      
        
    
          
  115. 
            
            

            

              end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
          
    116. 
        
    
      
        
    
          
  116. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
            
          
    117. 
        
    
      
        
    
          
  117. 
            1
            

            

              def price
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
          
    118. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
          
  118. 
            121
=======
          
  119. 
            
>>>>>>> 49e8a6c (Rebased)
            

            

                Money.new(price_cents)
          
    120. 
        
    
      
        
    
          
  120. 
<<<<<<< HEAD
=======
          
  121. 
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
            
            

            

              end
          
    122. 
        
    
      
        
    
          
  122. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
            
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
          
    123. 
        
    
      
        
    
          
  123. 
            1
            

            

              def price
          
    124. 
        
    
      
        
    
=======
>>>>>>> 872e675 (Fix)
          
  124. 
            125
=======
          
  125. 
            144
>>>>>>> 1d59aaa (Fix)
=======
          
  126. 
            143
>>>>>>> 851b4c0 (Fix)
=======
          
  127. 
            
>>>>>>> bebaea7 (Rebased)
=======
          
  128. 
            125
>>>>>>> eaef86a (Fix)
=======
          
  129. 
            144
>>>>>>> 1a9aba9 (Fix)
=======
          
  130. 
            143
>>>>>>> 4f1a459 (Fix)
=======
          
  131. 
            144
>>>>>>> 49e3b70 (Fix)
=======
          
  132. 
            145
>>>>>>> aa4fb26 (Add sort orders)
            

            

                Money.new(price_cents)
          
    133. 
        
    
      
        
    
          
  133. 
            
            

            

              end
          
    134. 
        
    
      
        
    
          
  134. 
            
            

            

>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
            end
          
    135.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderBookDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
=======
          
  6. 
>>>>>>> 836a973 (Rebased)
=======
          
  7. 
>>>>>>> 1577aeb (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
            
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
          
  8. 
            1
            

            

              def total_price
          
    9. 
        
    
      
        
    
          
  9. 
            8
            

            

                Money.new(book.price_cents * quantity)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
            
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
          
    12. 
        
    
      
        
    
=======
>>>>>>> 1577aeb (Rebased)
          
  12. 
            1
            

            

              def price
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
          
  13. 
            144
=======
          
  14. 
            121
>>>>>>> 1577aeb (Rebased)
            

            

                Money.new(price_cents)
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
            end
          
    17.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= =======

app/decorators/delivery_decorator.rb

75.0% lines covered

4 relevant lines. 3 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class DeliveryDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def price
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                Money.new(price_cents)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderBookDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def total_price
          
    7. 
        
    
      
        
    
          
  7. 
            10
            

            

                Money.new(book.price_cents * quantity)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.
<<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix)

app/decorators/order_decorator.rb

78.57% lines covered

14 relevant lines. 11 lines covered and 3 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def order_price(coupon = 0, delivery = 0)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
            27
=======
          
  8. 
            29
>>>>>>> 0b5b269 (Fix)
=======
          
  9. 
            27
>>>>>>> 8ad6192 (Fix)
=======
          
  10. 
            37
>>>>>>> 1ac6be1 (Fix)
=======
          
  11. 
            29
>>>>>>> 1a9aba9 (Fix)
=======
          
  12. 
            27
>>>>>>> 4f1a459 (Fix)
=======
          
  13. 
            37
>>>>>>> 49e3b70 (Fix)
=======
          
  14. 
            41
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
          
  15. 
            43
>>>>>>> aa4fb26 (Add sort orders)
            

            

                total_price = 0
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  16. 
            27
=======
          
  17. 
            29
>>>>>>> 0b5b269 (Fix)
=======
          
  18. 
            27
>>>>>>> 8ad6192 (Fix)
=======
          
  19. 
            37
>>>>>>> 1ac6be1 (Fix)
=======
          
  20. 
            29
>>>>>>> 1a9aba9 (Fix)
=======
          
  21. 
            27
>>>>>>> 4f1a459 (Fix)
=======
          
  22. 
            37
>>>>>>> 49e3b70 (Fix)
=======
          
  23. 
            41
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
          
  24. 
            43
>>>>>>> aa4fb26 (Add sort orders)
            

            

                order_books.each do |order_book|
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  25. 
            25
=======
          
  26. 
            27
>>>>>>> 0b5b269 (Fix)
=======
          
  27. 
            25
>>>>>>> 8ad6192 (Fix)
=======
          
  28. 
            27
>>>>>>> 1ac6be1 (Fix)
=======
          
  29. 
            27
>>>>>>> 1a9aba9 (Fix)
=======
          
  30. 
            25
>>>>>>> 4f1a459 (Fix)
=======
          
  31. 
            27
>>>>>>> 49e3b70 (Fix)
=======
          
  32. 
            29
>>>>>>> aa4fb26 (Add sort orders)
            

            

                  total_price += order_book.book.price_cents * order_book.quantity
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                end
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  34. 
            27
=======
          
  35. 
            29
>>>>>>> 0b5b269 (Fix)
=======
          
  36. 
            27
>>>>>>> 8ad6192 (Fix)
=======
          
  37. 
            37
>>>>>>> 1ac6be1 (Fix)
=======
          
  38. 
            29
>>>>>>> 1a9aba9 (Fix)
=======
          
  39. 
            27
>>>>>>> 4f1a459 (Fix)
=======
          
  40. 
            37
>>>>>>> 49e3b70 (Fix)
=======
          
  41. 
            41
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
          
  42. 
            43
>>>>>>> aa4fb26 (Add sort orders)
            

            

                Money.new(total_price - (total_price * coupon) + delivery)
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

              end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

              def price
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                Money.new(total_price)
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

              end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

              def date_time
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

                created_at.strftime('%m %d, %Y')
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

              end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

              def last_action_str
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                updated_at.strftime('%F')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

              end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            end
          
    57.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  2. 
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
          
  3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    4. 
        
    
      
        
    
          
  4. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  7. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  8. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
            
            

            

            end
          
    9. 
        
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
    
          
  4. 
            1
            

            

              def date_time
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8. 
        
    
      
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
=======
=======
>>>>>>> d780a52 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
        
    
          
  10. 
            1
            

            

              def date_time
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
            
            

            

            end
          
    14. 
        
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
<<<<<<< HEAD

app/decorators/user_decorator.rb

=======

app/decorators/review_decorator.rb

>>>>>>> 836a973 (Rebased)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> 836a973 (Rebased) 0 lines missed. 
    
    
      
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            class UserDecorator < Draper::Decorator
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> 836a973 (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
<<<<<<< HEAD
<<<<<<< HEAD
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 836a973 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
        
    
          
  10. 
            1
            

            

              def date_time
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
<<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
=======
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def date_time
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

app/helpers/application_helper.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'image_processing'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            module ApplicationHelper
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def markdown(text)
          
    5. 
        
    
      
        
    
          
  5. 
            17
            

            

                Markdown.new(text).to_html.html_safe
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module Constants
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              PAGINATION_PER_PAGE = 12
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              STAR_MIN = 0
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              STAR_MAX = 5
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              CATALOG_BOOK_COUNT = 3
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              BEST_SELLER_COUNT = 4
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              DESCRIPTION_LENGTH = 25
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              MAX_PRICE_IN_CENTS = 50_000
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
    16. 
        
    
      
        
    
=======
>>>>>>> cde4834 (Manifest_cache true)
          
  16. 
            1
            

            

<<<<<<< HEAD
              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BillingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:billing].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.billing.update(params[:billing])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ShippingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:shipping].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.shipping.update(params[:shipping])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

                billing_and_shipping_update(params, user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                return if params[:user].nil?
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                return if !params[:user][:password].nil? &&
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                          user.reset_password(params[:user][:password], params[:user][:password_confirmation])
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context.fail!
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              def billing_and_shipping_update(params, user)
          
    21. 
        
    
      
        
    
          
  21. 
            5
            

            

                return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            4
            

            

                !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            end
          
    26.

app/jobs/application_job.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ApplicationJob < ActiveJob::Base
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Automatically retry jobs that encountered a deadlock
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # retry_on ActiveRecord::Deadlocked
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

              # Most jobs are safe to ignore if the underlying records are no longer available
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              # discard_on ActiveJob::DeserializationError
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/jobs/cart_cleaner.rb

60.0% lines covered

5 relevant lines. 3 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CartCleaner < ApplicationJob
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # include Sidekiq::Job
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              queue_as :default
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def perform(order_id)
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                order = Order.find(order_id)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                order.destroy if order.status.eql?('initialized')
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Address < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              validates :first_name, :last_name,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                        length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                        format: { with: Constants::NAME_FORMAT,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                                  message: 'Please enter first or last in correct format' }, allow_blank: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :phone,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                        length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                        format: { with: Constants::PHONE_FORMAT,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                                  message: 'Please enter phone in correct format' }, allow_blank: true
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              validates :address,
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                        format: { with: Constants::TEXT_FORMAT,
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                                  message: 'Please enter address in correct format' }, allow_blank: true
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              validates :country, :city,
=======
                categories.map(&:name).join(', ')
>>>>>>> cde4834 (Manifest_cache true)
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

<<<<<<< HEAD
                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
=======
              end
>>>>>>> cde4834 (Manifest_cache true)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

<<<<<<< HEAD
                        format: { with: Constants::COUNTY_FORMAT,
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                                  message: 'Please enter country in correct format' }, allow_blank: true
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              validates :zip,
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                        length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                        format: { with: Constants::ZIP_FORMAT,
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                                  message: 'Please enter zip in correct format' }, allow_blank: true
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
            end
          
    25.
<<<<<<< HEAD

app/models/admin_user.rb

=======

app/decorators/category_decorator.rb

>>>>>>> cde4834 (Manifest_cache true)

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class PaginatingDecorator < Draper::CollectionDecorator
=======
            class AdminUser < ApplicationRecord
>>>>>>> 836a973 (Rebased)
=======
            class AdminUser < ApplicationRecord
=======
            class CategoryDecorator < Draper::Decorator
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> ab67c96 (Manifest_cache true)
=======
            class AdminUser < ApplicationRecord
>>>>>>> 1ac6be1 (Fix)
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
              devise :database_authenticatable,
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
            end
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
              devise :database_authenticatable,
>>>>>>> 1ac6be1 (Fix)
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
=======
            
          
    6. 
        
    
      
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
=======
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def date_time
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

app/helpers/application_helper.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'image_processing'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            module ApplicationHelper
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def markdown(text)
          
    5. 
        
    
      
        
    
          
  5. 
            17
            

            

                Markdown.new(text).to_html.html_safe
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/helpers/constants.rb

100.0% lines covered

26 relevant lines. 26 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module Constants
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              PAGINATION_PER_PAGE = 12
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              STAR_MIN = 0
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              STAR_MAX = 5
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              CATALOG_BOOK_COUNT = 3
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              BEST_SELLER_COUNT = 4
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              DESCRIPTION_LENGTH = 25
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              MAX_PRICE_IN_CENTS = 50_000
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

              CARD_NAME_MAX_LENGTH = 50
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              CARD_NAME_FORMAT = /\A[a-zA-Z ]*\z/.freeze
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

              CARD_CVV_FORMAT = /\A[0-9]{3}\z/.freeze
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              CARD_DATE_FORMAT = %r{\A(0[1-9]|1[0-2])/?([0-9]{4}|[0-9]{2})\z}.freeze
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

              CARD_CODE_FORMAT = /\A4[0-9]{15}(?:[0-9]{3})?\z/.freeze
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            end
          
    34.

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BillingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:billing].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.billing.update(params[:billing])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ShippingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:shipping].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.shipping.update(params[:shipping])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

                billing_and_shipping_update(params, user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                return if params[:user].nil?
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                return if !params[:user][:password].nil? &&
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                          user.reset_password(params[:user][:password], params[:user][:password_confirmation])
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context.fail!
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              def billing_and_shipping_update(params, user)
          
    21. 
        
    
      
        
    
          
  21. 
            5
            

            

                BillingUpdate.call(permitted_params: params, current_user: user) unless params[:billing].nil?
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            5
            

            

                ShippingUpdate.call(permitted_params: params, current_user: user) unless params[:shipping].nil?
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            end
          
    26.

app/jobs/cart_cleaner_job.rb

66.67% lines covered

6 relevant lines. 4 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CartCleanerJob
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Sidekiq::Worker
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              queue_as :default
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              def perform(order_id)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                order = Order.find(order_id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                order.destroy if order.status.eql?('initialized')
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Address < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              validates :first_name, :last_name,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                        length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                        format: { with: Constants::NAME_FORMAT,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                                  message: 'Please enter first or last in correct format' }, allow_blank: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :phone,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                        length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                        format: { with: Constants::PHONE_FORMAT,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                                  message: 'Please enter phone in correct format' }, allow_blank: true
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              validates :address,
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                        format: { with: Constants::TEXT_FORMAT,
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                                  message: 'Please enter address in correct format' }, allow_blank: true
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              validates :country, :city,
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                        format: { with: Constants::COUNTY_FORMAT,
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                                  message: 'Please enter country in correct format' }, allow_blank: true
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              validates :zip,
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                        length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                        format: { with: Constants::ZIP_FORMAT,
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                                  message: 'Please enter zip in correct format' }, allow_blank: true
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

app/models/admin_user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            module ApplicationHelper
=======
>>>>>>> 8f1bc14 (Fix)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            1
            

            

>>>>>>> 02a399d (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
          
  5. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
          
  6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  7. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  8. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  9. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
  10. 
>>>>>>> c033601 (Rebased)
=======
=======
          
  11. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  12. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  13. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  14. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  15. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  16. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  17. 
>>>>>>> bf554f4 (Rebased)
=======
=======
          
  18. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  19. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  20. 
>>>>>>> 866aee4 (Manifest_cache true)
=======
          
  21. 
>>>>>>> 8f1bc14 (Fix)
            
            

            

            end
          
    22.

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
=======
            class CategoryDecorator < Draper::Decorator
>>>>>>> cde4834 (Manifest_cache true)
=======
            class AdminUser < ApplicationRecord
>>>>>>> 1577aeb (Rebased)
=======
            class AdminUser < ApplicationRecord
=======
            class CategoryDecorator < Draper::Decorator
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
            class AdminUser < ApplicationRecord
>>>>>>> 49e3b70 (Fix)
=======
            class AdminUser < ApplicationRecord
=======
            class CategoryDecorator < Draper::Decorator
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 6edce20 (Manifest_cache true)
=======
            class AdminUser < ApplicationRecord
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate_all
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
              devise :database_authenticatable,
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable
>>>>>>> c033601 (Rebased)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
          
  8. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
          
  9. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  10. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  11. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  12. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
  13. 
>>>>>>> c033601 (Rebased)
=======
=======
          
  14. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  15. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  16. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  17. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  18. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  19. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  20. 
>>>>>>> bf554f4 (Rebased)
=======
=======
          
  21. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  22. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
          
  23. 
            1
            

            

              def date_time
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            end
          
    27.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

app/helpers/application_helper.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'image_processing'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            module ApplicationHelper
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def markdown(text)
          
    5. 
        
    
      
        
    
          
  5. 
            17
            

            

                Markdown.new(text).to_html.html_safe
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module Constants
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              PAGINATION_PER_PAGE = 12
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              STAR_MIN = 0
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              STAR_MAX = 5
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              CATALOG_BOOK_COUNT = 3
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              BEST_SELLER_COUNT = 4
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              DESCRIPTION_LENGTH = 25
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              MAX_PRICE_IN_CENTS = 50_000
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BillingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:billing].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.billing.update(params[:billing])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ShippingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:shipping].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.shipping.update(params[:shipping])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

                billing_and_shipping_update(params, user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                return if params[:user].nil?
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                return if !params[:user][:password].nil? &&
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                          user.reset_password(params[:user][:password], params[:user][:password_confirmation])
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context.fail!
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              def billing_and_shipping_update(params, user)
          
    21. 
        
    
      
        
    
          
  21. 
            5
            

            

                return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            4
            

            

                !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            end
          
    26.

app/jobs/application_job.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ApplicationJob < ActiveJob::Base
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Automatically retry jobs that encountered a deadlock
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # retry_on ActiveRecord::Deadlocked
          
    4. 
        
    
      
        
    
=======
>>>>>>> cde4834 (Manifest_cache true)
          
  4. 
            
            

            

<<<<<<< HEAD
            
=======
            end
>>>>>>> cde4834 (Manifest_cache true)
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

<<<<<<< HEAD
              # Most jobs are safe to ignore if the underlying records are no longer available
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              # discard_on ActiveJob::DeserializationError
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/jobs/cart_cleaner.rb

60.0% lines covered

5 relevant lines. 3 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CartCleaner < ApplicationJob
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # include Sidekiq::Job
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              queue_as :default
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def perform(order_id)
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                order = Order.find(order_id)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                order.destroy if order.status.eql?('initialized')
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Address < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
            
          
    4. 
        
    
      
<<<<<<< HEAD
        
    
          
  4. 
            1
            

            

              validates :first_name, :last_name,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                        length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                        format: { with: Constants::NAME_FORMAT,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                                  message: 'Please enter first or last in correct format' }, allow_blank: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :phone,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                        length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                        format: { with: Constants::PHONE_FORMAT,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                                  message: 'Please enter phone in correct format' }, allow_blank: true
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              validates :address,
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                        format: { with: Constants::TEXT_FORMAT,
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                                  message: 'Please enter address in correct format' }, allow_blank: true
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              validates :country, :city,
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                        format: { with: Constants::COUNTY_FORMAT,
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                                  message: 'Please enter country in correct format' }, allow_blank: true
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              validates :zip,
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                        length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                        format: { with: Constants::ZIP_FORMAT,
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                                  message: 'Please enter zip in correct format' }, allow_blank: true
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

app/models/admin_user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            class PaginatingDecorator < Draper::CollectionDecorator
=======
            class AdminUser < ApplicationRecord
>>>>>>> ee78f39 (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
=======
>>>>>>> ee78f39 (Rebased)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
              devise :database_authenticatable,
>>>>>>> ee78f39 (Rebased)
=======
=======
            end
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
              devise :database_authenticatable,
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
            end
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
              devise :database_authenticatable,
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
=======
            
          
    6.

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
=======
            
          
    2.

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            1
            

            

>>>>>>> 02a399d (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            1
            

            

>>>>>>> 02a399d (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
          
  6. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
          
  7. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  8. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  9. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  10. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
  11. 
>>>>>>> c033601 (Rebased)
=======
=======
          
  12. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  13. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  14. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  15. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  16. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  17. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  18. 
>>>>>>> bf554f4 (Rebased)
=======
=======
          
  19. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  20. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  21. 
>>>>>>> 866aee4 (Manifest_cache true)
=======
          
  22. 
>>>>>>> 8f1bc14 (Fix)
=======
          
  23. 
>>>>>>> e991554 (Manifest_cache true)
=======
          
  24. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            
            

            

            end
          
    25.

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def date_time
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
=======
>>>>>>> cde4834 (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD 4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'image_processing'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            module ApplicationHelper
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def markdown(text)
          
    5. 
        
    
      
        
    
          
  5. 
            13
            

            

                Markdown.new(text).to_html.html_safe
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module Constants
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              PAGINATION_PER_PAGE = 12
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              STAR_MIN = 0
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              STAR_MAX = 5
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              CATALOG_BOOK_COUNT = 3
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              BEST_SELLER_COUNT = 4
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              DESCRIPTION_LENGTH = 25
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              MAX_PRICE_IN_CENTS = 50_000
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BillingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:billing].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.billing.update(params[:billing])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ShippingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                return if params[:shipping].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                return if user.shipping.update(params[:shipping])
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                context.fail!
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            end
          
    15.

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def call
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                params = context.permitted_params
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                user = context.current_user
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

                billing_and_shipping_update(params, user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                return if params[:user].nil?
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                return if !params[:user][:password].nil? &&
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                          user.reset_password(params[:user][:password], params[:user][:password_confirmation])
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context.fail!
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              def billing_and_shipping_update(params, user)
          
    21. 
        
    
      
        
    
          
  21. 
            5
            

            

                return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            4
            

            

                !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            end
          
    26.

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Address < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              validates :first_name, :last_name,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                        length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                        format: { with: Constants::NAME_FORMAT,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                                  message: 'Please enter first or last in correct format' }, allow_blank: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :phone,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                        length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                        format: { with: Constants::PHONE_FORMAT,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                                  message: 'Please enter phone in correct format' }, allow_blank: true
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              validates :address,
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                        format: { with: Constants::TEXT_FORMAT,
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                                  message: 'Please enter address in correct format' }, allow_blank: true
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              validates :country, :city,
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                        format: { with: Constants::COUNTY_FORMAT,
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                                  message: 'Please enter country in correct format' }, allow_blank: true
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              validates :zip,
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                        length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                        format: { with: Constants::ZIP_FORMAT,
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                                  message: 'Please enter zip in correct format' }, allow_blank: true
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

app/models/admin_user.rb

100.0% lines covered

======= >>>>>>> cde4834 (Manifest_cache true) 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            class AdminUser < ApplicationRecord
=======
            module ApplicationHelper
>>>>>>> cde4834 (Manifest_cache true)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            
<<<<<<< HEAD
=======
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
>>>>>>> d780a52 (Rebased)
=======
          
  5. 
            1
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              # Include default devise modules. Others available are:
=======
=======
>>>>>>> d780a52 (Rebased)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
              devise :database_authenticatable,
>>>>>>> d780a52 (Rebased)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> cde4834 (Manifest_cache true)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
          
  6. 
            
            

            

                     :recoverable, :rememberable, :validatable
>>>>>>> c033601 (Rebased)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
          
  9. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
          
  10. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  11. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  12. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  13. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
  14. 
>>>>>>> c033601 (Rebased)
=======
=======
          
  15. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  16. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  17. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  18. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  19. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  20. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  21. 
>>>>>>> bf554f4 (Rebased)
=======
          
  22. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              devise :database_authenticatable,
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                     :recoverable, :rememberable, :validatable
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
            end
          
    26.

app/models/application_record.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ApplicationRecord < ActiveRecord::Base
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              self.abstract_class = true
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/models/author.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Author < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :authors_books, dependent: :destroy
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              has_many :books, through: :authors_books
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              validates :first_name, :last_name, presence: true
=======
              validates :first_name, presence: true
>>>>>>> cde4834 (Manifest_cache true)
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
              validates :first_name, :last_name, presence: true
=======
              validates :first_name, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
          
  6. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
  7. 
            1
            

            

              validates :last_name, presence: true
          
    8. 
        
    
      
        
    
          
  8. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  9. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
            
            

            

            end
          
    10.

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :author
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :author, :book, presence: true
=======
              validates :first_name, :last_name, presence: true
>>>>>>> bebaea7 (Rebased)
=======
              validates :first_name, :last_name, presence: true
=======
              validates :first_name, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 1a9aba9 (Fix)
=======
              validates :first_name, :last_name, presence: true
=======
              validates :first_name, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 49e3b70 (Fix)
=======
              validates :first_name, :last_name, presence: true
=======
              validates :first_name, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) =======

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :author
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :author, :book, presence: true
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

app/models/billing.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Billing < Address
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

app/models/book.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) 8 relevant lines. 8 lines covered and >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 8 relevant lines. 8 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> 8c32a77 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 113da87 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 078304c (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= 10 relevant lines. 10 lines covered and >>>>>>> 1ac6be1 (Fix) ======= 9 relevant lines. 9 lines covered and >>>>>>> cde4834 (Manifest_cache true) ======= 8 relevant lines. 8 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bebaea7 (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> 1a9aba9 (Fix) ======= 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 10 relevant lines. 10 lines covered and >>>>>>> 49e3b70 (Fix) ======= 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Book < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :authors_books, dependent: :destroy
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              has_many :authors, through: :authors_books
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              has_many :books_categories, dependent: :destroy
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              has_many :categories, through: :books_categories
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              has_many_attached :images
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
              has_many :reviews, dependent: :destroy
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 078304c (Rebased)
=======
              has_many :reviews, dependent: :destroy
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
              has_many_attached :images
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
              has_many_attached :images
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
=======
              has_many_attached :images
>>>>>>> 1ac6be1 (Fix)
=======
              validates :title, presence: true
>>>>>>> cde4834 (Manifest_cache true)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 1577aeb (Rebased)
=======
              has_many :reviews, dependent: :destroy
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> bebaea7 (Rebased)
=======
              has_many :reviews, dependent: :destroy
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
              has_many_attached :images
>>>>>>> 1a9aba9 (Fix)
=======
              has_many_attached :images
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
              has_many_attached :images
>>>>>>> 49e3b70 (Fix)
=======
              has_many_attached :images
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    9. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  9. 
            
=======
          
  10. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  11. 
            
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
          
  12. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
          
  13. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
          
  14. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
          
  15. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
          
  16. 
            
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  17. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
          
  18. 
            
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  19. 
            
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  20. 
            
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
              validates :description, presence: true
>>>>>>> cde4834 (Manifest_cache true)
=======
            
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
            
=======
              validates :description, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
            
>>>>>>> bebaea7 (Rebased)
=======
            
=======
              validates :description, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
            
>>>>>>> 1a9aba9 (Fix)
=======
            
=======
              validates :description, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
            
>>>>>>> 49e3b70 (Fix)
=======
            
=======
              validates :description, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
            
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              has_many_attached :images
=======
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              has_many_attached :images
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
              has_many :reviews, dependent: :destroy
>>>>>>> 1d59aaa (Fix)
=======
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 836a973 (Rebased)
=======
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
              has_many_attached :images
>>>>>>> 078304c (Rebased)
=======
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
              has_many :reviews, dependent: :destroy
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 1ac6be1 (Fix)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> cde4834 (Manifest_cache true)
=======
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 1577aeb (Rebased)
=======
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
              has_many_attached :images
>>>>>>> bebaea7 (Rebased)
=======
              has_many :reviews, dependent: :destroy
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
          
  22. 
<<<<<<< HEAD
<<<<<<< HEAD
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
=======
          
  24. 
>>>>>>> cde4834 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :price_cents, :quantity, presence: true,
>>>>>>> ee78f39 (Rebased)
=======
              validates :price_cents, :quantity, presence: true,
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> cde4834 (Manifest_cache true)
=======
              validates :price_cents, :quantity, presence: true,
>>>>>>> 1577aeb (Rebased)
=======
              validates :price_cents, :quantity, presence: true,
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
          
  25. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
          
    26. 
        
    
      
        
    
          
  26. 
=======
          
  27. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
                                                 numericality:
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
            end
          
    33.

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :category
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
=======
>>>>>>> 49e8a6c (Rebased)
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              has_many_attached :images
=======
                                                 numericality:
>>>>>>> 836a973 (Rebased)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> cde4834 (Manifest_cache true)
=======
                                                 numericality:
>>>>>>> 1577aeb (Rebased)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :price_cents, :quantity, presence: true,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                                                 numericality:
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  11. 
=======
          
  12. 
>>>>>>> 836a973 (Rebased)
=======
          
  13. 
>>>>>>> 1577aeb (Rebased)
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
    14. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  14. 
=======
          
  15. 
>>>>>>> 836a973 (Rebased)
=======
          
  16. 
>>>>>>> 1577aeb (Rebased)
            
            

            

<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            end
          
    17.

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :category
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
=======
>>>>>>> 078304c (Rebased)
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
              has_many_attached :images
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :price_cents, :quantity, presence: true,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                                                 numericality:
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
            end
          
    13.

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :category
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
=======
=======
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
  5. 
>>>>>>> bebaea7 (Rebased)
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :price_cents, :quantity, presence: true,
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                                                 numericality:
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            end
          
    12.

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :category
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :category, :book, presence: true
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.

app/models/category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Category < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :books_categories, dependent: :destroy
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              has_many :books, through: :books_categories
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :name, presence: true
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= >>>>>>> df37394 (Featire specs) ======= =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======
======= >>>>>>> 715fac2 (Featire specs) ======= =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======
======= >>>>>>> 3dc272d (Featire specs) ======= =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 26b462d (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)

app/models/coupon.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Coupon < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :order, optional: true
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/models/credit_card.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CreditCard < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              validates :name, length: { maximum: Constants::CARD_NAME_MAX_LENGTH }, format: { with: Constants::CARD_NAME_FORMAT },
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                               allow_blank: true
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              validates :expiration_date, format: { with: Constants::CARD_DATE_FORMAT },
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                                          allow_blank: true
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              validates :cvv, format: { with: Constants::CARD_CVV_FORMAT },
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                              allow_blank: true
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              validates :code, format: { with: Constants::CARD_CODE_FORMAT },
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                               allow_blank: true
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.

app/models/delivery.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Delivery < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :orders, dependent: :nullify
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              validates :delivery_method, presence: true
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            end
          
    6.

app/models/order.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Order < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :order_books, dependent: :destroy
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              has_many :books, through: :order_books
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              has_one :coupon, dependent: :nullify
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              has_one :address, dependent: :nullify
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              belongs_to :delivery, optional: true
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

app/models/order_book.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class OrderBook < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :order
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            end
          
    5.
>>>>>>> 7c4ea7f (Fix)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 4552227 (Featire specs) ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= 7 relevant lines. >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= 7 relevant lines. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Review < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              validates :rating,
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                        numericality: {
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                        }, presence: true
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            end
          
    17.

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Shipping < Address
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

57.14% lines covered

14 relevant lines. 8 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :omniauthable, omniauth_providers: [:facebook]
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              has_one :billing, dependent: :destroy
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              has_one :credit_card, dependent: :destroy
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              has_many :orders, dependent: :destroy
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              def self.from_omniauth(auth)
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  user.provider = auth.provider
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  user.uid = auth.uid
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  user.name = auth.info.name
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  user.email = auth.info.email
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            end
          
    24.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 26b462d (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix)

app/models/coupon.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Coupon < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :order, optional: true
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/models/order.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Order < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :order_books, dependent: :destroy
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              has_many :books, through: :order_books
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              has_one :coupon, dependent: :nullify
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.

app/models/order_book.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class OrderBook < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :order
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            end
          
    5.
>>>>>>> 7c4ea7f (Fix)

app/models/user.rb

100.0% ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 4552227 (Featire specs) ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= 7 relevant lines. >>>>>>> 8f1bc14 (Fix) 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Review < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              validates :rating,
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                        numericality: {
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                        }, presence: true
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            end
          
    17.

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Shipping < Address
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

53.85% lines covered

13 relevant lines. 7 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :omniauthable, omniauth_providers: [:facebook]
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              has_one :billing, dependent: :destroy
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              has_one :order, dependent: :destroy
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              def self.from_omniauth(auth)
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  user.provider = auth.provider
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  user.uid = auth.uid
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  user.name = auth.info.name
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  user.email = auth.info.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

              end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            end
          
    23.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 26b462d (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD

app/models/coupon.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Coupon < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :order, optional: true
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/models/order.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Order < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              has_many :order_books, dependent: :destroy
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              has_many :books, through: :order_books
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              has_one :coupon, dependent: :nullify
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.

app/models/order_book.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class OrderBook < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :order
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            end
          
    5.
>>>>>>> 7c4ea7f (Fix)

app/models/user.rb

100.0% ======= <<<<<<< HEAD ======= 87.5% ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 4552227 (Featire specs) ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Review < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              validates :rating,
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                        numericality: {
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                        }, presence: true
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            end
          
    17.

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Shipping < Address
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

53.85% lines covered

13 relevant lines. 7 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :omniauthable, omniauth_providers: [:facebook]
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              has_one :billing, dependent: :destroy
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              has_one :order, dependent: :destroy
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              def self.from_omniauth(auth)
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  user.provider = auth.provider
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  user.uid = auth.uid
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  user.name = auth.info.name
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  user.email = auth.info.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

              end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            end
          
    23.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e50f73e (Add login registration pages)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Review < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              validates :rating,
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                        numericality: {
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                        }, presence: true
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            end
          
    17.

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Shipping < Address
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

50.0% lines covered

12 relevant lines. 6 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :omniauthable, omniauth_providers: [:facebook]
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              has_one :billing, dependent: :destroy
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              def self.from_omniauth(auth)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                  user.provider = auth.provider
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  user.uid = auth.uid
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  user.name = auth.info.name
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  user.email = auth.info.email
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            end
          
    22.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages)

app/models/user.rb

<<<<<<< HEAD =======

app/models/review.rb

>>>>>>> aca90e3 (Rebased) ======= >>>>>>> d96cf3b (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
=======
            class Review < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              belongs_to :user
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              belongs_to :book
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              validates :rating,
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                        numericality: {
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                        }, presence: true
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            end
          
    17.

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class Shipping < Address
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.

app/models/user.rb

50.0% lines covered

12 relevant lines. 6 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

>>>>>>> aca90e3 (Rebased)
            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
=======
          
  5. 
>>>>>>> aca90e3 (Rebased)
            1
            

            

              devise :database_authenticatable, :registerable,
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
          
  6. 
=======
          
  7. 
>>>>>>> aca90e3 (Rebased)
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
          
  8. 
=======
          
  9. 
>>>>>>> aca90e3 (Rebased)
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
          
  10. 
=======
          
  11. 
>>>>>>> aca90e3 (Rebased)
            
            

            

<<<<<<< HEAD
                     :omniauthable
=======
                     :omniauthable, omniauth_providers: [:facebook]
>>>>>>> aca90e3 (Rebased)
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              has_one :billing, dependent: :destroy
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def self.from_omniauth(auth)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  user.provider = auth.provider
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                  user.uid = auth.uid
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                  user.name = auth.info.name
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                  user.email = auth.info.email
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
>>>>>>> aca90e3 (Rebased)
            
            

            

            end
          
    29.
<<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

app/queries/book_query.rb

90.0% lines covered

10 relevant lines. 9 lines covered and ======= 2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class User < ApplicationRecord
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

              # Include default devise modules. Others available are:
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                     :omniauthable
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
>>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eaef86a (Fix) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eaef86a (Fix) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= 10 relevant lines. 9 lines covered and >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BookQuery
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
                              'title DESC'].freeze
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                              'title DESC'].freeze
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                              'title DESC'].freeze
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
                              'title DESC'].freeze
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                              'title DESC'].freeze
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
                              'title DESC'].freeze
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
                              'title DESC'].freeze
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                              'title DESC'].freeze
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                              'title DESC'].freeze
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
                              'title DESC'].freeze
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
              def self.query(params)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
=======
          
  6. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  7. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  8. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  9. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  10. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  11. 
            30
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
          
  12. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5caffae (Add login registration pages)
          
  13. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  14. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
          
  15. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  16. 
            24
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  17. 
            24
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  18. 
            24
>>>>>>> 715fac2 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
          
  19. 
            24
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
=======
=======
          
  20. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  21. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  22. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
>>>>>>> 69eb97e (Add login registration pages)
=======
          
  23. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
          
  24. 
            30
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  25. 
            30
=======
          
  26. 
            30
>>>>>>> 9620751 (Featire specs)
=======
          
  27. 
            30
>>>>>>> 9dc109d (Featire specs)
=======
          
  28. 
            30
>>>>>>> 65f3409 (Featire specs)
=======
          
  29. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  30. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  31. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
>>>>>>> fb10fe4 (Add login registration pages)
=======
          
  32. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
=======
          
  33. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  34. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  35. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
>>>>>>> 089f8cf (Add login registration pages)
=======
          
  36. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  37. 
            30
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  38. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 58d403b (Add login registration pages)
=======
          
  39. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
=======
          
  40. 
            30
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  41. 
            30
=======
          
  42. 
            30
>>>>>>> 9620751 (Featire specs)
=======
          
  43. 
            30
>>>>>>> 9dc109d (Featire specs)
=======
          
  44. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  45. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  46. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0005d4a (Add login registration pages)
=======
          
  47. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
          
  48. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  49. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  50. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> b575a28 (Add login registration pages)
=======
          
  51. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  52. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  53. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5caffae (Add login registration pages)
=======
>>>>>>> 0edd9b7 (Add login registration pages)
=======
          
  54. 
            25
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  55. 
            30
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  56. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  57. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  58. 
            30
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  59. 
            30
=======
          
  60. 
            30
>>>>>>> 9620751 (Featire specs)
=======
          
  61. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  62. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  63. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  64. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
          
  65. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  66. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  67. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  68. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> eaef86a (Fix)
=======
          
  69. 
            30
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  70. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d7fadcd (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  71. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 5caffae (Add login registration pages)
=======
<<<<<<< HEAD
          
  72. 
            25
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 282f108 (Add login registration pages)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> db0e854 (Add login registration pages)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5caffae (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 3a43955 (Add login registration pages)
=======
=======
          
  73. 
            30
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  74. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
          
  75. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  76. 
            30
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
          
  77. 
            30
=======
          
  78. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
          
  79. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  80. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  81. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
          
  82. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
          
  83. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  84. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  85. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
=======
          
  86. 
            30
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 0005d4a (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 58d403b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b26425c (Add login registration pages)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b575a28 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5caffae (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
          
  87. 
            30
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fb10fe4 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 69eb97e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 055b00f (Add login registration pages)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 089f8cf (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0edd9b7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 61908af (Add login registration pages)
=======
=======
          
  88. 
            30
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    89. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  89. 
            12
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
  90. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  91. 
=======
          
  92. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  93. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  94. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
          
  96. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  97. 
            12
=======
          
  98. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  99. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  100. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  101. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  102. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  103. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  104. 
=======
          
  105. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  106. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  107. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  108. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  109. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
          
  110. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  111. 
=======
          
  112. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  113. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  114. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  115. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  116. 
            12
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3dc272d (Featire specs)
          
  117. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  118. 
=======
          
  119. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  120. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  121. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  122. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  123. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  124. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  125. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  126. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  127. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  128. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
          
  129. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  130. 
            12
=======
          
  131. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  132. 
            12
>>>>>>> 9dc109d (Featire specs)
=======
          
  133. 
            12
>>>>>>> 65f3409 (Featire specs)
=======
          
  134. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  135. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  136. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  137. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  138. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  139. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  140. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  141. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  142. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  143. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  144. 
            12
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  145. 
            12
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  146. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  147. 
            12
=======
          
  148. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  149. 
            12
>>>>>>> 9dc109d (Featire specs)
=======
          
  150. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  151. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  152. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  153. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  154. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  155. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  156. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  157. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  158. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  159. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  160. 
            12
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  161. 
            12
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  162. 
            12
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                  if params[:category].nil?
          
    163. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  163. 
            12
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
  164. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  165. 
=======
          
  166. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  167. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  168. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  169. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
          
  170. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  171. 
            12
=======
          
  172. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  173. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  174. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  175. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  176. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  177. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  178. 
=======
          
  179. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  180. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  181. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  182. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  183. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
          
  184. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  185. 
=======
          
  186. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  187. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  188. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  189. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  190. 
            12
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3dc272d (Featire specs)
          
  191. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  192. 
=======
          
  193. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  194. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  195. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  196. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  197. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  198. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  199. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  200. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  201. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  202. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
          
  203. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  204. 
            12
=======
          
  205. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  206. 
            12
>>>>>>> 9dc109d (Featire specs)
=======
          
  207. 
            12
>>>>>>> 65f3409 (Featire specs)
=======
          
  208. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  209. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  210. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  211. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  212. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  213. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  214. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  215. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  216. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  217. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  218. 
            12
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  219. 
            12
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
=======
=======
          
  220. 
            12
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  221. 
            12
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  222. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  223. 
            12
=======
          
  224. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  225. 
            12
>>>>>>> 9dc109d (Featire specs)
=======
          
  226. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  227. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  228. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
<<<<<<< HEAD
          
  229. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  230. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  231. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  232. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  233. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  234. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  235. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  236. 
            12
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
                    Book.order(params[:sort])
=======
                    Book.all.order(params[:sort])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    Book.order(params[:sort])
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
                    Book.order(params[:sort])
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
                    Book.order(params[:sort])
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
                    Book.order(params[:sort])
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
                    Book.order(params[:sort])
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
                    Book.order(params[:sort])
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    237. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
          
  237. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  238. 
=======
          
  239. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  240. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  241. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  242. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  243. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
          
  244. 
=======
          
  245. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  246. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  247. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  248. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  249. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  250. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  251. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  252. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
          
  253. 
=======
          
  254. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  255. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  256. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
          
  257. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  258. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
          
  259. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  260. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  261. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  262. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  263. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  264. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  265. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  266. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  267. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  268. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
          
  269. 
=======
          
  270. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  271. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  272. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  273. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  274. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  275. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  276. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  277. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  278. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  279. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  280. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  281. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  282. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                  else
          
    283. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
          
  283. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  284. 
=======
          
  285. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  286. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  287. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  288. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  289. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
  290. 
=======
          
  291. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  292. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  293. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  294. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  295. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  296. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  297. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  298. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
          
  299. 
=======
          
  300. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  301. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  302. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
          
  303. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  304. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  305. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  306. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  307. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  308. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  309. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  310. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  311. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  312. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  313. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  314. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  315. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  316. 
=======
          
  317. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  318. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  319. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
          
  320. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  321. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  322. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  323. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  324. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  325. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  326. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  327. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  328. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  329. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  330. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  331. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  332. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  333. 
=======
          
  334. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  335. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  336. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  337. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  338. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  339. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  340. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  341. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  342. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  343. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    344. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
          
  344. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  345. 
=======
          
  346. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  347. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  348. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  349. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  350. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
          
  351. 
=======
          
  352. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  353. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  354. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  355. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  356. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  357. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  358. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  359. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
          
  360. 
=======
          
  361. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  362. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  363. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
          
  364. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  365. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
          
  366. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  367. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  368. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  369. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  370. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  371. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  372. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  373. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  374. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  375. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
          
  376. 
=======
          
  377. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  378. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  379. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  380. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  381. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  382. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  383. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  384. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  385. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  386. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  387. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  388. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  389. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                  end
          
    390. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  390. 
            18
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
  391. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  392. 
=======
          
  393. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  394. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  395. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  396. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
          
  397. 
            18
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
          
  398. 
            18
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
          
  399. 
            18
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  400. 
            18
            

            

                elsif params[:category].nil?
          
    401. 
        
    
      
        
    
          
  401. 
            16
            

            

                  Book.all
          
    402. 
        
    
      
        
    
          
  402. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
          
  403. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
          
  404. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  405. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
            
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
            

            

                elsif params[:category].nil?
          
    406. 
        
    
      
        
    
          
  406. 
            16
            

            

                  Book.all
          
    407. 
        
    
      
        
    
          
  407. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
=======
          
  408. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
          
  409. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  410. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
            
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
            

            

                elsif params[:category].nil?
          
    411. 
        
    
      
        
    
          
  411. 
            16
            

            

                  Book.all
          
    412. 
        
    
      
        
    
          
  412. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
          
  413. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
          
  414. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
            
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
            

            

                elsif params[:category].nil?
          
    415. 
        
    
      
        
    
          
  415. 
            16
            

            

                  Book.all
          
    416. 
        
    
      
        
    
          
  416. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
          
  417. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  418. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  419. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  420. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  421. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  422. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  423. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
            
>>>>>>> d96cf3b (Featire specs)
            

            

                elsif params[:category].nil?
          
    424. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  424. 
            16
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27ceb6f (Add login registration pages)
          
  425. 
            17
<<<<<<< HEAD
=======
=======
          
  426. 
            18
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  427. 
            17
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  428. 
            17
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 27ceb6f (Add login registration pages)
=======
=======
          
  429. 
            18
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  430. 
            2
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
          
  431. 
            2
=======
          
  432. 
            17
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  433. 
            17
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  434. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
          
  435. 
            18
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27ceb6f (Add login registration pages)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  Book.all
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 12bcf81 (Featire specs)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> ee78f39 (Rebased)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 836a973 (Rebased)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 1577aeb (Rebased)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
          
    436. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
          
  436. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  437. 
=======
          
  438. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  439. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  440. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  441. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  442. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
          
  443. 
=======
          
  444. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  445. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  446. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
          
  447. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  448. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  449. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
          
  450. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
          
  451. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  452. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
          
  453. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  454. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  455. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                else
          
    456. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
          
  456. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  457. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> fd3e35e (Featire specs)
          
  458. 
=======
          
  459. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  460. 
>>>>>>> 4e81ea2 (Featire specs)
            17
=======
          
  461. 
            18
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  462. 
            17
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  463. 
            17
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5affcb (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57da3ff (Add login registration pages)
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
          
  464. 
            18
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
          
  465. 
            2
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
          
  466. 
            2
=======
          
  467. 
            2
>>>>>>> 9620751 (Featire specs)
=======
          
  468. 
            17
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  469. 
            17
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  470. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
  471. 
            17
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
          
  472. 
            17
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
          
  473. 
            17
<<<<<<< HEAD
=======
>>>>>>> 3dc272d (Featire specs)
=======
          
  474. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
          
  475. 
            17
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  476. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  477. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  478. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  479. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
          
  480. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
=======
          
  481. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
=======
          
  482. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
          
  483. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  484. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  485. 
            17
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  486. 
            17
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  487. 
            18
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
=======
          
  488. 
            2
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  489. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
=======
          
  490. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  491. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  492. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  493. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
          
  494. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
          
  495. 
            17
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  496. 
            17
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  497. 
            18
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> aeec696 (Add login registration pages)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  498. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
=======
          
  499. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  500. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  501. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  502. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
          
  503. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
=======
          
  504. 
            17
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  505. 
            17
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  506. 
            18
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
            

            

<<<<<<< HEAD
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    507. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  507. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  508. 
=======
          
  509. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  510. 
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  511. 
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  512. 
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  513. 
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
          
  514. 
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
          
  515. 
>>>>>>> 13fd74f (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  516. 
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  517. 
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  518. 
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
>>>>>>> 3b03895 (Featire specs)
=======
          
  519. 
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  520. 
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  521. 
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  522. 
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  523. 
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  524. 
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> e54deeb (Featire specs)
=======
          
  525. 
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  526. 
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  527. 
>>>>>>> ed6aebd (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  528. 
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  529. 
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  530. 
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  531. 
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  532. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  533. 
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  534. 
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  535. 
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  536. 
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  537. 
=======
>>>>>>> df37394 (Featire specs)
=======
          
  538. 
=======
>>>>>>> 715fac2 (Featire specs)
=======
          
  539. 
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  540. 
=======
          
  541. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  542. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  543. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  544. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  545. 
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
          
  546. 
=======
          
  547. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  548. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  549. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  550. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  551. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  552. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  553. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  554. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  555. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
          
  556. 
=======
          
  557. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  558. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  559. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  560. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  561. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  562. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  563. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  564. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  565. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  566. 
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> bcd09ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  567. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  568. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  569. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  570. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  571. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  572. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
          
  573. 
=======
          
  574. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  575. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  576. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  577. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  578. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  579. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  580. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  581. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  582. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  583. 
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  584. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  585. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  586. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  587. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  588. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  589. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  590. 
=======
          
  591. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  592. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  593. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  594. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  595. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  596. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  597. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  598. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  599. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                end
          
    600. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  600. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
          
  601. 
=======
          
  602. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  603. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  604. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  605. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  606. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  607. 
>>>>>>> e54deeb (Featire specs)
=======
          
  608. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  609. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  610. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  611. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  612. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
          
  613. 
=======
          
  614. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  615. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  616. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  617. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  618. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  619. 
>>>>>>> e54deeb (Featire specs)
=======
          
  620. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  621. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  622. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  623. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
          
  624. 
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
          
  625. 
=======
          
  626. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  627. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  628. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  629. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  630. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  631. 
>>>>>>> e54deeb (Featire specs)
=======
          
  632. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  633. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  634. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  635. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
          
  636. 
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  637. 
=======
          
  638. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  639. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  640. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  641. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  642. 
=======
          
  643. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  644. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  645. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  646. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  647. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  648. 
=======
          
  649. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  650. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  651. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  652. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  653. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  654. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  655. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  656. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  657. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  658. 
=======
          
  659. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  660. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  661. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  662. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  663. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  664. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  665. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  666. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  667. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  668. 
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  669. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  670. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  671. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  672. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  673. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  674. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  675. 
=======
          
  676. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  677. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  678. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  679. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  680. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  681. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  682. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  683. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  684. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  685. 
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  686. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  687. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  688. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  689. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  690. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  691. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  692. 
=======
          
  693. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  694. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  695. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  696. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  697. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  698. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  699. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  700. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  701. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

              end
          
    702. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  702. 
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
          
  703. 
=======
          
  704. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  705. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  706. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  707. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  708. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  709. 
>>>>>>> e54deeb (Featire specs)
=======
          
  710. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  711. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  712. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  713. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
          
  714. 
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
          
  715. 
=======
          
  716. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  717. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  718. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  719. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  720. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  721. 
>>>>>>> e54deeb (Featire specs)
=======
          
  722. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  723. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  724. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  725. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
          
  726. 
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
          
  727. 
=======
          
  728. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  729. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  730. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  731. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  732. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  733. 
>>>>>>> e54deeb (Featire specs)
=======
          
  734. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  735. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  736. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  737. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
          
  738. 
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  739. 
=======
          
  740. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  741. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  742. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  743. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  744. 
=======
          
  745. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  746. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  747. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  748. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  749. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
  750. 
=======
          
  751. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
          
  752. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  753. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  754. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  755. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  756. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  757. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  758. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  759. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  760. 
=======
          
  761. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  762. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
          
  763. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
  764. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  765. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
  766. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  767. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  768. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  769. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  770. 
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  771. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  772. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
          
  773. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  774. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
          
  775. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  776. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  777. 
=======
          
  778. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  779. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  780. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  781. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  782. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  783. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  784. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  785. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  786. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  787. 
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  788. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  789. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
          
  790. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  791. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  792. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  793. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  794. 
=======
          
  795. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  796. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  797. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  798. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  799. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
          
  800. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  801. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  802. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  803. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

            end
          
    804.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= =======

app/queries/order_query.rb

36.36% lines covered

11 relevant lines. 4 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class OrderQuery
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              SORT_METHODS = ['created_at', 'created_at DESC', 'total_price DESC', 'total_price',
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                              'status', 'status DESC'].freeze
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              ORDER_STATUS = %w[delivered confirmed created canceled].freeze
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def self.query(params, current_user)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                if SORT_METHODS.include?(params[:sort].to_s)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  if params[:status].nil?
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                    Order.where(user_id: current_user.id, status: %i[delivered created confirmed canceled]).order(params[:sort])
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  else
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                    Order.where(user_id: current_user.id, status: params[:status]).order(params[:sort])
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                elsif ORDER_STATUS.include?(params[:status].to_s)
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                  Order.where(user_id: current_user.id, status: params[:status])
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                else
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  Order.where(user_id: current_user.id, status: %i[delivered created confirmed canceled])
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.
>>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders)

app/services/book_service.rb

88.89% lines covered

9 relevant lines. 8 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BookService
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def self.quantity_update(params, product, order, book, coupon)
          
    3. 
        
    
      
        
    
          
  3. 
            2
            

            

                discount = 0
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                discount = coupon.discount unless coupon.nil?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                if product.save
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  {
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                    total_price: order.decorate.order_price(discount).to_s,
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                    sub_price: order.decorate.order_price.to_s,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                    price: product.decorate.total_price.to_s,
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                    discount: (order.decorate.order_price * discount).to_s,
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                    book_quantity: book.quantity
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                  }
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                else
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  { notice: 'Error!' }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.

app/services/checkout_service.rb

50.0% lines covered

4 relevant lines. 2 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CheckoutService
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def self.to_errors(message)
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                message.map do |k, v|
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

                  "#{k} #{v.join(', ')}"
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                end.join("\n")
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/services/coupon_service.rb

81.82% lines covered

11 relevant lines. 9 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CouponService
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def self.find_coupon(params, order, coupon)
          
    3. 
        
    
      
        
    
          
  3. 
            4
            

            

                error_message = I18n.t('order.coupon.error')
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                if coupon.nil?
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                  error_message = ' ' if params[:code].eql?('')
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  { error: error_message, total_price: order.decorate.order_price.to_s }
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

                elsif !coupon.is_active
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  error_message = ' ' if params[:code].eql?('')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  { error: error_message, total_price: order.decorate.order_price.to_s }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                else
          
    13. 
        
    
      
        
    
          
  13. 
            3
            

            

                  { total_price: order.decorate.order_price(coupon.discount).to_s,
          
    14. 
        
    
      
        
    
          
  14. 
            3
            

            

                    discount: (order.decorate.order_price * coupon.discount).to_s }
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/application.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 7 relevant lines. 7 lines covered and ======= 6 relevant lines. 6 lines covered and <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= 7 relevant lines. 7 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative 'boot'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            require 'rails/all'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            # Require the gems listed in Gemfile, including any gems
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            # you've limited to :test, :development, or :production.
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

            Bundler.require(*Rails.groups)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

            module BookStore
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              class Application < Rails::Application
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                # Initialize configuration defaults for originally generated Rails version.
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                config.load_defaults 6.1
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  13. 
            1
=======
          
  14. 
            
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  15. 
            1
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  16. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  17. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  18. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
          
  19. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  20. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  21. 
            1
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                config.autoloader = :classic
=======
            
>>>>>>> cde4834 (Manifest_cache true)
=======
                config.autoloader = :classic
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
                config.autoloader = :classic
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
                config.autoloader = :classic
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                # Configuration for the application, engines, and railties goes here.
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                #
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                # These settings can be overridden in specific environments using the files
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                # in config/environments, which are processed later.
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                #
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                # config.time_zone = "Central Time (US & Canada)"
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                # config.eager_load_paths << Rails.root.join("extras")
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            end
          
    31.

config/boot.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            require 'bundler/setup' # Set up gems listed in the Gemfile.
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
          
    5.

config/environment.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Load the Rails application.
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative 'application'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # Initialize the Rails application.
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

            Rails.application.initialize!
          
    6.

config/environments/test.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 19 relevant lines. 19 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'active_support/core_ext/integer/time'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # The test environment is used exclusively to run your application's
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # test suite. You never need to work with it otherwise. Remember that
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            # your test database is "scratch space" for the test suite and is wiped
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            # and recreated between test runs. Don't rely on the data there!
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

            Rails.application.configure do
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              # Settings specified here will take precedence over those in config/application.rb.
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              config.cache_classes = false
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              config.action_view.cache_template_loading = true
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              # Do not eager load code on boot. This avoids loading your whole application
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              # just for the purpose of running a single test. If you are using a tool that
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              # preloads Rails for running tests, you may have to set it to true.
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              config.eager_load = false
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              # Configure public file server for tests with Cache-Control for performance.
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              config.public_file_server.enabled = true
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              config.public_file_server.headers = {
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                'Cache-Control' => "public, max-age=#{1.hour.to_i}"
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              }
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              # Show full error reports and disable caching.
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              config.consider_all_requests_local       = true
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              config.action_controller.perform_caching = false
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

              config.cache_store = :null_store
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              # Raise exceptions instead of rendering exception templates.
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              config.action_dispatch.show_exceptions = false
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

              # Disable request forgery protection in test environment.
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

              config.action_controller.allow_forgery_protection = false
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

              # Store uploaded files on the local file system in a temporary directory.
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

              config.active_storage.service = :test
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

              config.action_mailer.perform_caching = false
          
    40. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  40. 
            1
=======
          
  41. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  42. 
            1
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
          
  43. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
          
  44. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
          
  45. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
          
  46. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
          
  47. 
            1
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  48. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
          
  49. 
            1
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  50. 
            1
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  51. 
            1
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
            
>>>>>>> cde4834 (Manifest_cache true)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> bebaea7 (Rebased)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 1a9aba9 (Fix)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 49e3b70 (Fix)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

              # Tell Action Mailer not to deliver emails to the real world.
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

              # The :test delivery method accumulates sent emails in the
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

              # ActionMailer::Base.deliveries array.
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

              config.action_mailer.delivery_method = :test
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              # Print deprecation notices to the stderr.
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

              config.active_support.deprecation = :stderr
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

              # Raise exceptions for disallowed deprecations.
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

              config.active_support.disallowed_deprecation = :raise
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

              # Tell Active Support which deprecation messages to disallow.
          
    64. 
        
    
      
        
    
          
  64. 
            1
            

            

              config.active_support.disallowed_deprecation_warnings = []
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

            
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

              # Raises error for missing translations.
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

              # config.i18n.raise_on_missing_translations = true
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

              # Annotate rendered view with file names.
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

              # config.action_view.annotate_rendered_view_with_filenames = true
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            end
          
    72.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/active_admin.rb

100.0% lines covered

11 relevant lines. 11 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.setup do |config|
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.site_title = 'Book Store'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              config.authentication_method = :authenticate_admin_user!
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              config.current_user_method = :current_admin_user
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              config.logout_link_path = :destroy_admin_user_session_path
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              config.batch_actions = true
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              config.filter_attributes = %i[encrypted_password password password_confirmation]
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              config.localize_format = :long
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              config.default_per_page = 30
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              config.max_per_page = 10_000
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              config.use_webpacker = true
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/application_controller_renderer.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # ActiveSupport::Reloader.to_prepare do
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            #   ApplicationController.renderer.defaults.merge!(
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            #     http_host: 'example.org',
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            #     https: false
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            #   )
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            # end
          
    9.

config/initializers/assets.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # Version of your assets, change this if you want to expire all your assets.
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            Rails.application.config.assets.version = '1.0'
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            # Add additional assets to the asset load path.
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            # Rails.application.config.assets.paths << Emoji.images_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            # Add Yarn node_modules folder to the asset load path.
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

            Rails.application.config.assets.paths << Rails.root.join('node_modules')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            # Precompile additional assets.
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            # application.js, application.css, and all non-JS/CSS in the app/assets
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            # folder are already added.
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            # Rails.application.config.assets.precompile += %w( admin.js admin.css )
          
    15.

config/initializers/backtrace_silencers.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

            Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']
          
    9.

config/initializers/content_security_policy.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # Define an application-wide content security policy
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # For further information see the following documentation
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            # Rails.application.config.content_security_policy do |policy|
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            #   policy.default_src :self, :https
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            #   policy.font_src    :self, :https, :data
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            #   policy.img_src     :self, :https, :data
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            #   policy.object_src  :none
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            #   policy.script_src  :self, :https
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            #   policy.style_src   :self, :https
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            #   # If you are using webpack-dev-server then specify webpack-dev-server host
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            #   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            #   # Specify URI for violation reports
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            #   # policy.report_uri "/csp-violation-report-endpoint"
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            # end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            # If you are using UJS then enable automatic nonce generation
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            # Set the nonce only to specific directives
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            # Report CSP violations to a specified URI
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            # For further information see the following documentation:
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            # Rails.application.config.content_security_policy_report_only = true
          
    31.

config/initializers/cookies_serializer.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # Specify a serializer for the signed and encrypted cookie jars.
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # Valid options are :json, :marshal, and :hybrid.
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

            Rails.application.config.action_dispatch.cookies_serializer = :json
          
    6.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/devise.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> d780a52 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> d52ad35 (Rebased) ======= 13 relevant lines. 13 lines covered and >>>>>>> df37394 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1d59aaa (Fix) ======= 13 relevant lines. 13 lines covered and >>>>>>> 715fac2 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1ac6be1 (Fix) ======= 13 relevant lines. 13 lines covered and >>>>>>> 3dc272d (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
          
  3. 
            1
=======
          
  4. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  5. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
          
  6. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
          
  7. 
            1
>>>>>>> d52ad35 (Rebased)
=======
          
  8. 
            
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
          
  9. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
          
  10. 
            
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
          
  11. 
            1
>>>>>>> 1d59aaa (Fix)
=======
          
  12. 
            
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
          
  13. 
            1
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
          
  14. 
            1
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
          
  15. 
            1
>>>>>>> 1ac6be1 (Fix)
=======
          
  16. 
            
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
          
  17. 
            1
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
          
  18. 
            1
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
          
  19. 
            1
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
          
  20. 
            1
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

            Devise.setup do |config|
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Assuming you have not yet modified this file, each configuration option below
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 715fac2 (Featire specs)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 3dc272d (Featire specs)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    21. 
        
    
      
        
    
          
  21. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  22. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  23. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  24. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  25. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> d96cf3b (Featire specs)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> df37394 (Featire specs)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 715fac2 (Featire specs)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 3dc272d (Featire specs)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
            1
=======
          
  27. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  28. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  29. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  30. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> d96cf3b (Featire specs)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> df37394 (Featire specs)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 715fac2 (Featire specs)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 3dc272d (Featire specs)
          
    31. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  31. 
            1
=======
          
  32. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  33. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  34. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  35. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> d96cf3b (Featire specs)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> df37394 (Featire specs)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 715fac2 (Featire specs)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 3dc272d (Featire specs)
          
    36. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  36. 
            1
=======
          
  37. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  38. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  39. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  40. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> d96cf3b (Featire specs)
=======
            # Devise change the default values for those options).
>>>>>>> df37394 (Featire specs)
=======
            # Devise change the default values for those options).
>>>>>>> 715fac2 (Featire specs)
=======
            # Devise change the default values for those options).
>>>>>>> 3dc272d (Featire specs)
          
    41. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  41. 
            1
=======
          
  42. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  43. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  44. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  45. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> d96cf3b (Featire specs)
=======
            #
>>>>>>> df37394 (Featire specs)
=======
            #
>>>>>>> 715fac2 (Featire specs)
=======
            #
>>>>>>> 3dc272d (Featire specs)
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  46. 
            1
=======
          
  47. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  48. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  49. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  50. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> d96cf3b (Featire specs)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> df37394 (Featire specs)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 715fac2 (Featire specs)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 3dc272d (Featire specs)
          
    51. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  51. 
            1
=======
          
  52. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  53. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  54. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  55. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> d96cf3b (Featire specs)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> df37394 (Featire specs)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 715fac2 (Featire specs)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 3dc272d (Featire specs)
          
    56. 
        
    
      
        
    
          
  56. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  57. 
>>>>>>> d780a52 (Rebased)
=======
          
  58. 
>>>>>>> ee78f39 (Rebased)
=======
          
  59. 
>>>>>>> 836a973 (Rebased)
=======
          
  60. 
>>>>>>> 1577aeb (Rebased)
            1
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 264ef06 (Add login registration pages)
=======
            1
>>>>>>> df37394 (Featire specs)
=======
            1
>>>>>>> 715fac2 (Featire specs)
=======
            1
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> d96cf3b (Featire specs)
=======
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 264ef06 (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> df37394 (Featire specs)
=======
            Devise.setup do |config|
>>>>>>> 715fac2 (Featire specs)
=======
            Devise.setup do |config|
>>>>>>> 3dc272d (Featire specs)
          
    61. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  61. 
            1
=======
          
  62. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  63. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  64. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  65. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> d96cf3b (Featire specs)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> df37394 (Featire specs)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 715fac2 (Featire specs)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 3dc272d (Featire specs)
          
    66. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  66. 
            1
=======
          
  67. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  68. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  69. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  70. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> d96cf3b (Featire specs)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> df37394 (Featire specs)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 715fac2 (Featire specs)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 3dc272d (Featire specs)
          
    71. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  71. 
            1
=======
          
  72. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  73. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  74. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  75. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> d96cf3b (Featire specs)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> df37394 (Featire specs)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 715fac2 (Featire specs)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 3dc272d (Featire specs)
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
            1
=======
          
  77. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  78. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  79. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  80. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> d96cf3b (Featire specs)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> df37394 (Featire specs)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 715fac2 (Featire specs)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 3dc272d (Featire specs)
          
    81. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  81. 
            1
=======
          
  82. 
            
>>>>>>> d96cf3b (Featire specs)
=======
          
  83. 
            
>>>>>>> df37394 (Featire specs)
=======
          
  84. 
            
>>>>>>> 715fac2 (Featire specs)
=======
          
  85. 
            
>>>>>>> 3dc272d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> d96cf3b (Featire specs)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> df37394 (Featire specs)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 715fac2 (Featire specs)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 3dc272d (Featire specs)
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> d96cf3b (Featire specs)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> df37394 (Featire specs)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 715fac2 (Featire specs)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 3dc272d (Featire specs)
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> d96cf3b (Featire specs)
=======
            
>>>>>>> df37394 (Featire specs)
=======
            
>>>>>>> 715fac2 (Featire specs)
=======
            
>>>>>>> 3dc272d (Featire specs)
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> d96cf3b (Featire specs)
=======
              # ==> Controller configuration
>>>>>>> df37394 (Featire specs)
=======
              # ==> Controller configuration
>>>>>>> 715fac2 (Featire specs)
=======
              # ==> Controller configuration
>>>>>>> 3dc272d (Featire specs)
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # Configure the parent class to the devise controllers.
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

              # ==> Mailer Configuration
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

              # with default "from" parameter.
          
    96. 
        
    
      
        
    
          
  96. 
=======
=======
>>>>>>> 264ef06 (Add login registration pages)
          
  97. 
>>>>>>> d780a52 (Rebased)
            1
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
          
  98. 
            
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
          
  99. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  100. 
            
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
            

            

              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
          
    101. 
        
    
      
        
    
          
  101. 
            1
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
            

            

<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
<<<<<<< HEAD
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
          
    102. 
        
    
      
        
    
<<<<<<< HEAD
          
  102. 
            1
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
            

            

<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
<<<<<<< HEAD
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
          
    103. 
        
    
      
        
    
<<<<<<< HEAD
          
  103. 
            1
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
            

            

<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
<<<<<<< HEAD
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
          
  104. 
            1
            

            

              config.skip_session_storage = [:http_auth]
          
    105. 
        
    
      
        
    
          
  105. 
            1
            

            

              config.stretches = Rails.env.test? ? 1 : 12
          
    106. 
        
    
      
        
    
          
  106. 
            1
            

            

              config.reconfirmable = true
          
    107. 
        
    
      
        
    
          
  107. 
            1
            

            

              config.expire_all_remember_me_on_sign_out = true
          
    108. 
        
    
      
        
    
          
  108. 
            1
            

            

              config.password_length = 6..128
          
    109. 
        
    
      
        
    
          
  109. 
            1
            

            

              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
          
    110. 
        
    
      
        
    
          
  110. 
            1
            

            

              config.reset_password_within = 6.hours
          
    111. 
        
    
      
        
    
          
  111. 
            1
            

            

              config.sign_out_via = :delete
          
    112. 
        
    
      
        
    
          
  112. 
            1
            

            

              config.omniauth :facebook,
          
    113. 
        
    
      
        
    
          
  113. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
          
    114. 
        
    
      
        
    
          
  114. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
          
    115. 
        
    
      
        
    
          
  115. 
            
            

            

                              scope: 'email', info_fields: 'email,name'
          
    116. 
        
    
      
        
    
          
  116. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> df37394 (Featire specs)
              # Configure the parent class to the devise controllers.
          
    117. 
        
    
      
        
    
          
  117. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
    118. 
        
    
      
        
    
          
  118. 
            
            

            

            
          
    119. 
        
    
      
        
    
          
  119. 
            
            

            

              # ==> Mailer Configuration
          
    120. 
        
    
      
        
    
          
  120. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
    122. 
        
    
      
        
    
          
  122. 
            
            

            

              # with default "from" parameter.
          
    123. 
        
    
      
        
    
          
  123. 
=======
=======
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
          
  124. 
>>>>>>> ee78f39 (Rebased)
            1
=======
          
  125. 
            
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  126. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  127. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
          
  128. 
            
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
          
    129. 
        
    
      
        
    
          
  129. 
            1
            

            

              require 'devise/orm/active_record'
          
    130. 
        
    
      
        
    
          
  130. 
            1
            

            

              config.case_insensitive_keys = [:email]
          
    131. 
        
    
      
        
    
          
  131. 
            1
            

            

              config.strip_whitespace_keys = [:email]
          
    132. 
        
    
      
        
    
          
  132. 
            1
            

            

              config.skip_session_storage = [:http_auth]
          
    133. 
        
    
      
        
    
          
  133. 
            
            

            

              # config.stretches = Rails.env.test? ? 1 : 1
          
    134. 
        
    
      
        
    
          
  134. 
            1
            

            

              config.reconfirmable = true
          
    135. 
        
    
      
        
    
          
  135. 
            1
            

            

              config.expire_all_remember_me_on_sign_out = true
          
    136. 
        
    
      
        
    
          
  136. 
            1
            

            

              config.password_length = 6..128
          
    137. 
        
    
      
        
    
          
  137. 
            1
            

            

              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
          
    138. 
        
    
      
        
    
          
  138. 
            1
            

            

              config.reset_password_within = 6.hours
          
    139. 
        
    
      
        
    
          
  139. 
            1
            

            

              config.sign_out_via = :delete
          
    140. 
        
    
      
        
    
          
  140. 
            1
            

            

              config.omniauth :facebook,
          
    141. 
        
    
      
        
    
          
  141. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
          
    142. 
        
    
      
        
    
          
  142. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
          
    143. 
        
    
      
        
    
          
  143. 
            
            

            

                              scope: 'email', info_fields: 'email,name'
          
    144. 
        
    
      
        
    
          
  144. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 852864e (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 715fac2 (Featire specs)
              # Configure the parent class to the devise controllers.
          
    145. 
        
    
      
        
    
          
  145. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
    146. 
        
    
      
        
    
          
  146. 
            
            

            

            
          
    147. 
        
    
      
        
    
          
  147. 
            
            

            

              # ==> Mailer Configuration
          
    148. 
        
    
      
        
    
          
  148. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
    149. 
        
    
      
        
    
          
  149. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
    150. 
        
    
      
        
    
          
  150. 
            
            

            

              # with default "from" parameter.
          
    151. 
        
    
      
        
    
          
  151. 
=======
          
  152. 
>>>>>>> 836a973 (Rebased)
            1
=======
          
  153. 
            
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  154. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  155. 
            
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
            

            

              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
          
    156. 
        
    
      
        
    
          
  156. 
            1
            

            

              require 'devise/orm/active_record'
          
    157. 
        
    
      
        
    
          
  157. 
            1
            

            

              config.case_insensitive_keys = [:email]
          
    158. 
        
    
      
        
    
          
  158. 
            1
            

            

              config.strip_whitespace_keys = [:email]
          
    159. 
        
    
      
        
    
          
  159. 
            1
            

            

              config.skip_session_storage = [:http_auth]
          
    160. 
        
    
      
        
    
          
  160. 
            1
            

            

              config.stretches = Rails.env.test? ? 1 : 12
          
    161. 
        
    
      
        
    
          
  161. 
            1
            

            

              config.reconfirmable = true
          
    162. 
        
    
      
        
    
          
  162. 
            1
            

            

              config.expire_all_remember_me_on_sign_out = true
          
    163. 
        
    
      
        
    
          
  163. 
            1
            

            

              config.password_length = 6..128
          
    164. 
        
    
      
        
    
          
  164. 
            1
            

            

              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
          
    165. 
        
    
      
        
    
          
  165. 
            1
            

            

              config.reset_password_within = 6.hours
          
    166. 
        
    
      
        
    
          
  166. 
            1
            

            

              config.sign_out_via = :delete
          
    167. 
        
    
      
        
    
          
  167. 
            1
            

            

              config.omniauth :facebook,
          
    168. 
        
    
      
        
    
          
  168. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
          
    169. 
        
    
      
        
    
          
  169. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
          
    170. 
        
    
      
        
    
          
  170. 
            
            

            

                              scope: 'email', info_fields: 'email,name'
          
    171. 
        
    
      
        
    
          
  171. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
=======
>>>>>>> 282f108 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 3dc272d (Featire specs)
              # Configure the parent class to the devise controllers.
          
    172. 
        
    
      
        
    
          
  172. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
    173. 
        
    
      
        
    
          
  173. 
            
            

            

            
          
    174. 
        
    
      
        
    
          
  174. 
            
            

            

              # ==> Mailer Configuration
          
    175. 
        
    
      
        
    
          
  175. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
    176. 
        
    
      
        
    
          
  176. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
    177. 
        
    
      
        
    
          
  177. 
            
            

            

              # with default "from" parameter.
          
    178. 
        
    
      
        
    
          
  178. 
=======
          
  179. 
>>>>>>> 1577aeb (Rebased)
            1
=======
          
  180. 
            
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  181. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  182. 
            
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
            

            

              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
          
    183. 
        
    
      
        
    
          
  183. 
            1
            

            

              require 'devise/orm/active_record'
          
    184. 
        
    
      
        
    
          
  184. 
            1
            

            

              config.case_insensitive_keys = [:email]
          
    185. 
        
    
      
        
    
          
  185. 
            1
            

            

              config.strip_whitespace_keys = [:email]
          
    186. 
        
    
      
        
    
          
  186. 
            1
            

            

              config.skip_session_storage = [:http_auth]
          
    187. 
        
    
      
        
    
          
  187. 
            1
            

            

              config.stretches = Rails.env.test? ? 1 : 12
          
    188. 
        
    
      
        
    
          
  188. 
            1
            

            

              config.reconfirmable = true
          
    189. 
        
    
      
        
    
          
  189. 
            1
            

            

              config.expire_all_remember_me_on_sign_out = true
          
    190. 
        
    
      
        
    
          
  190. 
            1
            

            

              config.password_length = 6..128
          
    191. 
        
    
      
        
    
          
  191. 
            1
            

            

              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
          
    192. 
        
    
      
        
    
          
  192. 
            1
            

            

              config.reset_password_within = 6.hours
          
    193. 
        
    
      
        
    
          
  193. 
            1
            

            

              config.sign_out_via = :delete
          
    194. 
        
    
      
        
    
          
  194. 
            1
            

            

              config.omniauth :facebook,
          
    195. 
        
    
      
        
    
          
  195. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
          
    196. 
        
    
      
        
    
          
  196. 
            
            

            

                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
          
    197. 
        
    
      
        
    
          
  197. 
            
            

            

                              scope: 'email', info_fields: 'email,name'
          
    198. 
        
    
      
        
    
          
  198. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
>>>>>>> aeec696 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
              # Configure the parent class to the devise controllers.
          
    199. 
        
    
      
        
    
          
  199. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
    200. 
        
    
      
        
    
          
  200. 
            
            

            

            
          
    201. 
        
    
      
        
    
          
  201. 
            
            

            

              # ==> Mailer Configuration
          
    202. 
        
    
      
        
    
          
  202. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
    203. 
        
    
      
        
    
          
  203. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
    204. 
        
    
      
        
    
          
  204. 
            
            

            

              # with default "from" parameter.
          
    205. 
        
    
      
        
    
          
  205. 
            1
            

            

              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
          
    206. 
        
    
      
        
    
          
  206. 
            
            

            

            
          
    207. 
        
    
      
        
    
          
  207. 
            
            

            

              # Configure the class responsible to send e-mails.
          
    208. 
        
    
      
        
    
          
  208. 
            
            

            

              # config.mailer = 'Devise::Mailer'
          
    209. 
        
    
      
        
    
          
  209. 
            
            

            

            
          
    210. 
        
    
      
        
    
          
  210. 
            
            

            

              # Configure the parent class responsible to send e-mails.
          
    211. 
        
    
      
        
    
          
  211. 
            
            

            

              # config.parent_mailer = 'ActionMailer::Base'
          
    212. 
        
    
      
        
    
          
  212. 
            
            

            

            
          
    213. 
        
    
      
        
    
          
  213. 
            
            

            

              # ==> ORM configuration
          
    214. 
        
    
      
        
    
          
  214. 
            
            

            

              # Load and configure the ORM. Supports :active_record (default) and
          
    215. 
        
    
      
        
    
          
  215. 
            
            

            

              # :mongoid (bson_ext recommended) by default. Other ORMs may be
          
    216. 
        
    
      
        
    
          
  216. 
            
            

            

              # available as additional gems.
          
    217. 
        
    
      
        
    
          
  217. 
            1
            

            

              require 'devise/orm/active_record'
          
    218. 
        
    
      
        
    
          
  218. 
            
            

            

            
          
    219. 
        
    
      
        
    
          
  219. 
            
            

            

              # ==> Configuration for any authentication mechanism
          
    220. 
        
    
      
        
    
          
  220. 
            
            

            

              # Configure which keys are used when authenticating a user. The default is
          
    221. 
        
    
      
        
    
          
  221. 
            
            

            

              # just :email. You can configure it to use [:username, :subdomain], so for
          
    222. 
        
    
      
        
    
          
  222. 
            
            

            

              # authenticating a user, both parameters are required. Remember that those
          
    223. 
        
    
      
        
    
          
  223. 
            
            

            

              # parameters are used only when authenticating and not when retrieving from
          
    224. 
        
    
      
        
    
          
  224. 
            
            

            

              # session. If you need permissions, you should implement that in a before filter.
          
    225. 
        
    
      
        
    
          
  225. 
            
            

            

              # You can also supply a hash where the value is a boolean determining whether
          
    226. 
        
    
      
        
    
          
  226. 
            
            

            

              # or not authentication should be aborted when the value is not present.
          
    227. 
        
    
      
        
    
          
  227. 
            
            

            

              # config.authentication_keys = [:email]
          
    228. 
        
    
      
        
    
          
  228. 
            
            

            

            
          
    229. 
        
    
      
        
    
          
  229. 
            
            

            

              # Configure parameters from the request object used for authentication. Each entry
          
    230. 
        
    
      
        
    
          
  230. 
            
            

            

              # given should be a request method and it will automatically be passed to the
          
    231. 
        
    
      
        
    
          
  231. 
            
            

            

              # find_for_authentication method and considered in your model lookup. For instance,
          
    232. 
        
    
      
        
    
          
  232. 
            
            

            

              # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
          
    233. 
        
    
      
        
    
          
  233. 
            
            

            

              # The same considerations mentioned for authentication_keys also apply to request_keys.
          
    234. 
        
    
      
        
    
          
  234. 
            
            

            

              # config.request_keys = []
          
    235. 
        
    
      
        
    
          
  235. 
            
            

            

            
          
    236. 
        
    
      
        
    
          
  236. 
            
            

            

              # Configure which authentication keys should be case-insensitive.
          
    237. 
        
    
      
        
    
          
  237. 
            
            

            

              # These keys will be downcased upon creating or modifying a user and when used
          
    238. 
        
    
      
        
    
          
  238. 
            
            

            

              # to authenticate or find a user. Default is :email.
          
    239. 
        
    
      
        
    
          
  239. 
            1
            

            

              config.case_insensitive_keys = [:email]
          
    240. 
        
    
      
        
    
          
  240. 
            
            

            

            
          
    241. 
        
    
      
        
    
          
  241. 
            
            

            

              # Configure which authentication keys should have whitespace stripped.
          
    242. 
        
    
      
        
    
          
  242. 
            
            

            

              # These keys will have whitespace before and after removed upon creating or
          
    243. 
        
    
      
        
    
          
  243. 
            
            

            

              # modifying a user and when used to authenticate or find a user. Default is :email.
          
    244. 
        
    
      
        
    
          
  244. 
            1
            

            

              config.strip_whitespace_keys = [:email]
          
    245. 
        
    
      
        
    
          
  245. 
            
            

            

            
          
    246. 
        
    
      
        
    
          
  246. 
            
            

            

              # Tell if authentication through request.params is enabled. True by default.
          
    247. 
        
    
      
        
    
          
  247. 
            
            

            

              # It can be set to an array that will enable params authentication only for the
          
    248. 
        
    
      
        
    
          
  248. 
            
            

            

              # given strategies, for example, `config.params_authenticatable = [:database]` will
          
    249. 
        
    
      
        
    
          
  249. 
            
            

            

              # enable it only for database (email + password) authentication.
          
    250. 
        
    
      
        
    
          
  250. 
            
            

            

              # config.params_authenticatable = true
          
    251. 
        
    
      
        
    
          
  251. 
            
            

            

            
          
    252. 
        
    
      
        
    
          
  252. 
            
            

            

              # Tell if authentication through HTTP Auth is enabled. False by default.
          
    253. 
        
    
      
        
    
          
  253. 
            
            

            

              # It can be set to an array that will enable http authentication only for the
          
    254. 
        
    
      
        
    
          
  254. 
            
            

            

              # given strategies, for example, `config.http_authenticatable = [:database]` will
          
    255. 
        
    
      
        
    
          
  255. 
            
            

            

              # enable it only for database authentication.
          
    256. 
        
    
      
        
    
          
  256. 
            
            

            

              # For API-only applications to support authentication "out-of-the-box", you will likely want to
          
    257. 
        
    
      
        
    
          
  257. 
            
            

            

              # enable this with :database unless you are using a custom strategy.
          
    258. 
        
    
      
        
    
          
  258. 
            
            

            

              # The supported strategies are:
          
    259. 
        
    
      
        
    
          
  259. 
            
            

            

              # :database      = Support basic authentication with authentication key + password
          
    260. 
        
    
      
        
    
          
  260. 
            
            

            

              # config.http_authenticatable = false
          
    261. 
        
    
      
        
    
          
  261. 
            
            

            

            
          
    262. 
        
    
      
        
    
          
  262. 
            
            

            

              # If 401 status code should be returned for AJAX requests. True by default.
          
    263. 
        
    
      
        
    
          
  263. 
            
            

            

              # config.http_authenticatable_on_xhr = true
          
    264. 
        
    
      
        
    
          
  264. 
            
            

            

            
          
    265. 
        
    
      
        
    
          
  265. 
            
            

            

              # The realm used in Http Basic Authentication. 'Application' by default.
          
    266. 
        
    
      
        
    
          
  266. 
            
            

            

              # config.http_authentication_realm = 'Application'
          
    267. 
        
    
      
        
    
          
  267. 
            
            

            

            
          
    268. 
        
    
      
        
    
          
  268. 
            
            

            

              # It will change confirmation, password recovery and other workflows
          
    269. 
        
    
      
        
    
          
  269. 
            
            

            

              # to behave the same regardless if the e-mail provided was right or wrong.
          
    270. 
        
    
      
        
    
          
  270. 
            
            

            

              # Does not affect registerable.
          
    271. 
        
    
      
        
    
          
  271. 
            
            

            

              # config.paranoid = true
          
    272. 
        
    
      
        
    
          
  272. 
            
            

            

            
          
    273. 
        
    
      
        
    
          
  273. 
            
            

            

              # By default Devise will store the user in session. You can skip storage for
          
    274. 
        
    
      
        
    
          
  274. 
            
            

            

              # particular strategies by setting this option.
          
    275. 
        
    
      
        
    
          
  275. 
            
            

            

              # Notice that if you are skipping storage for all authentication paths, you
          
    276. 
        
    
      
        
    
          
  276. 
            
            

            

              # may want to disable generating routes to Devise's sessions controller by
          
    277. 
        
    
      
        
    
          
  277. 
            
            

            

              # passing skip: :sessions to `devise_for` in your config/routes.rb
          
    278. 
        
    
      
        
    
          
  278. 
            1
            

            

              config.skip_session_storage = [:http_auth]
          
    279. 
        
    
      
        
    
          
  279. 
            
            

            

            
          
    280. 
        
    
      
        
    
          
  280. 
            
            

            

              # By default, Devise cleans up the CSRF token on authentication to
          
    281. 
        
    
      
        
    
          
  281. 
            
            

            

              # avoid CSRF token fixation attacks. This means that, when using AJAX
          
    282. 
        
    
      
        
    
          
  282. 
            
            

            

              # requests for sign in and sign up, you need to get a new CSRF token
          
    283. 
        
    
      
        
    
          
  283. 
            
            

            

              # from the server. You can disable this option at your own risk.
          
    284. 
        
    
      
        
    
          
  284. 
            
            

            

              # config.clean_up_csrf_token_on_authentication = true
          
    285. 
        
    
      
        
    
          
  285. 
            
            

            

            
          
    286. 
        
    
      
        
    
          
  286. 
            
            

            

              # When false, Devise will not attempt to reload routes on eager load.
          
    287. 
        
    
      
        
    
          
  287. 
            
            

            

              # This can reduce the time taken to boot the app but if your application
          
    288. 
        
    
      
        
    
          
  288. 
            
            

            

              # requires the Devise mappings to be loaded during boot time the application
          
    289. 
        
    
      
        
    
          
  289. 
            
            

            

              # won't boot properly.
          
    290. 
        
    
      
        
    
          
  290. 
            
            

            

              # config.reload_routes = true
          
    291. 
        
    
      
        
    
          
  291. 
            
            

            

            
          
    292. 
        
    
      
        
    
          
  292. 
            
            

            

              # ==> Configuration for :database_authenticatable
          
    293. 
        
    
      
        
    
          
  293. 
            
            

            

              # For bcrypt, this is the cost for hashing the password and defaults to 12. If
          
    294. 
        
    
      
        
    
          
  294. 
            
            

            

              # using other algorithms, it sets how many times you want the password to be hashed.
          
    295. 
        
    
      
        
    
          
  295. 
            
            

            

              # The number of stretches used for generating the hashed password are stored
          
    296. 
        
    
      
        
    
          
  296. 
            
            

            

              # with the hashed password. This allows you to change the stretches without
          
    297. 
        
    
      
        
    
          
  297. 
            
            

            

              # invalidating existing passwords.
          
    298. 
        
    
      
        
    
          
  298. 
            
            

            

              #
          
    299. 
        
    
      
        
    
          
  299. 
            
            

            

              # Limiting the stretches to just one in testing will increase the performance of
          
    300. 
        
    
      
        
    
          
  300. 
            
            

            

              # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
          
    301. 
        
    
      
        
    
          
  301. 
            
            

            

              # a value less than 10 in other environments. Note that, for bcrypt (the default
          
    302. 
        
    
      
        
    
          
  302. 
            
            

            

              # algorithm), the cost increases exponentially with the number of stretches (e.g.
          
    303. 
        
    
      
        
    
          
  303. 
            
            

            

              # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
          
    304. 
        
    
      
        
    
          
  304. 
            1
            

            

              config.stretches = Rails.env.test? ? 1 : 12
          
    305. 
        
    
      
        
    
          
  305. 
            
            

            

            
          
    306. 
        
    
      
        
    
          
  306. 
            
            

            

              # Set up a pepper to generate the hashed password.
          
    307. 
        
    
      
        
    
          
  307. 
            
            

            

              # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
          
    308. 
        
    
      
        
    
          
  308. 
            
            

            

            
          
    309. 
        
    
      
        
    
          
  309. 
            
            

            

              # Send a notification to the original email when the user's email is changed.
          
    310. 
        
    
      
        
    
          
  310. 
            
            

            

              # config.send_email_changed_notification = false
          
    311. 
        
    
      
        
    
          
  311. 
            
            

            

            
          
    312. 
        
    
      
        
    
          
  312. 
            
            

            

              # Send a notification email when the user's password is changed.
          
    313. 
        
    
      
        
    
          
  313. 
            
            

            

              # config.send_password_change_notification = false
          
    314. 
        
    
      
        
    
          
  314. 
            
            

            

            
          
    315. 
        
    
      
        
    
          
  315. 
            
            

            

              # ==> Configuration for :confirmable
          
    316. 
        
    
      
        
    
          
  316. 
            
            

            

              # A period that the user is allowed to access the website even without
          
    317. 
        
    
      
        
    
          
  317. 
            
            

            

              # confirming their account. For instance, if set to 2.days, the user will be
          
    318. 
        
    
      
        
    
          
  318. 
            
            

            

              # able to access the website for two days without confirming their account,
          
    319. 
        
    
      
        
    
          
  319. 
            
            

            

              # access will be blocked just in the third day.
          
    320. 
        
    
      
        
    
          
  320. 
            
            

            

              # You can also set it to nil, which will allow the user to access the website
          
    321. 
        
    
      
        
    
          
  321. 
            
            

            

              # without confirming their account.
          
    322. 
        
    
      
        
    
          
  322. 
            
            

            

              # Default is 0.days, meaning the user cannot access the website without
          
    323. 
        
    
      
        
    
          
  323. 
            
            

            

              # confirming their account.
          
    324. 
        
    
      
        
    
          
  324. 
            
            

            

              # config.allow_unconfirmed_access_for = 2.days
          
    325. 
        
    
      
        
    
          
  325. 
            
            

            

            
          
    326. 
        
    
      
        
    
          
  326. 
            
            

            

              # A period that the user is allowed to confirm their account before their
          
    327. 
        
    
      
        
    
          
  327. 
            
            

            

              # token becomes invalid. For example, if set to 3.days, the user can confirm
          
    328. 
        
    
      
        
    
          
  328. 
            
            

            

              # their account within 3 days after the mail was sent, but on the fourth day
          
    329. 
        
    
      
        
    
          
  329. 
            
            

            

              # their account can't be confirmed with the token any more.
          
    330. 
        
    
      
        
    
          
  330. 
            
            

            

              # Default is nil, meaning there is no restriction on how long a user can take
          
    331. 
        
    
      
        
    
          
  331. 
            
            

            

              # before confirming their account.
          
    332. 
        
    
      
        
    
          
  332. 
            
            

            

              # config.confirm_within = 3.days
          
    333. 
        
    
      
        
    
          
  333. 
            
            

            

            
          
    334. 
        
    
      
        
    
          
  334. 
            
            

            

              # If true, requires any email changes to be confirmed (exactly the same way as
          
    335. 
        
    
      
        
    
          
  335. 
            
            

            

              # initial account confirmation) to be applied. Requires additional unconfirmed_email
          
    336. 
        
    
      
        
    
          
  336. 
            
            

            

              # db field (see migrations). Until confirmed, new email is stored in
          
    337. 
        
    
      
        
    
          
  337. 
            
            

            

              # unconfirmed_email column, and copied to email column on successful confirmation.
          
    338. 
        
    
      
        
    
          
  338. 
            1
            

            

              config.reconfirmable = true
          
    339. 
        
    
      
        
    
          
  339. 
            
            

            

            
          
    340. 
        
    
      
        
    
          
  340. 
            
            

            

              # Defines which key will be used when confirming an account
          
    341. 
        
    
      
        
    
          
  341. 
            
            

            

              # config.confirmation_keys = [:email]
          
    342. 
        
    
      
        
    
          
  342. 
            
            

            

            
          
    343. 
        
    
      
        
    
          
  343. 
            
            

            

              # ==> Configuration for :rememberable
          
    344. 
        
    
      
        
    
          
  344. 
            
            

            

              # The time the user will be remembered without asking for credentials again.
          
    345. 
        
    
      
        
    
          
  345. 
            
            

            

              # config.remember_for = 2.weeks
          
    346. 
        
    
      
        
    
          
  346. 
            
            

            

            
          
    347. 
        
    
      
        
    
          
  347. 
            
            

            

              # Invalidates all the remember me tokens when the user signs out.
          
    348. 
        
    
      
        
    
          
  348. 
            1
            

            

              config.expire_all_remember_me_on_sign_out = true
          
    349. 
        
    
      
        
    
          
  349. 
            
            

            

            
          
    350. 
        
    
      
        
    
          
  350. 
            
            

            

              # If true, extends the user's remember period when remembered via cookie.
          
    351. 
        
    
      
        
    
          
  351. 
            
            

            

              # config.extend_remember_period = false
          
    352. 
        
    
      
        
    
          
  352. 
            
            

            

            
          
    353. 
        
    
      
        
    
          
  353. 
            
            

            

              # Options to be passed to the created cookie. For instance, you can set
          
    354. 
        
    
      
        
    
          
  354. 
            
            

            

              # secure: true in order to force SSL only cookies.
          
    355. 
        
    
      
        
    
          
  355. 
            
            

            

              # config.rememberable_options = {}
          
    356. 
        
    
      
        
    
          
  356. 
            
            

            

            
          
    357. 
        
    
      
        
    
          
  357. 
            
            

            

              # ==> Configuration for :validatable
          
    358. 
        
    
      
        
    
          
  358. 
            
            

            

              # Range for password length.
          
    359. 
        
    
      
        
    
          
  359. 
            1
            

            

              config.password_length = 6..128
          
    360. 
        
    
      
        
    
          
  360. 
            
            

            

            
          
    361. 
        
    
      
        
    
          
  361. 
            
            

            

              # Email regex used to validate email formats. It simply asserts that
          
    362. 
        
    
      
        
    
          
  362. 
            
            

            

              # one (and only one) @ exists in the given string. This is mainly
          
    363. 
        
    
      
        
    
          
  363. 
            
            

            

              # to give user feedback and not to assert the e-mail validity.
          
    364. 
        
    
      
        
    
          
  364. 
            1
            

            

              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
          
    365. 
        
    
      
        
    
          
  365. 
            
            

            

            
          
    366. 
        
    
      
        
    
          
  366. 
            
            

            

              # ==> Configuration for :timeoutable
          
    367. 
        
    
      
        
    
          
  367. 
            
            

            

              # The time you want to timeout the user session without activity. After this
          
    368. 
        
    
      
        
    
          
  368. 
            
            

            

              # time the user will be asked for credentials again. Default is 30 minutes.
          
    369. 
        
    
      
        
    
          
  369. 
            
            

            

              # config.timeout_in = 30.minutes
          
    370. 
        
    
      
        
    
          
  370. 
            
            

            

            
          
    371. 
        
    
      
        
    
          
  371. 
            
            

            

              # ==> Configuration for :lockable
          
    372. 
        
    
      
        
    
          
  372. 
            
            

            

              # Defines which strategy will be used to lock an account.
          
    373. 
        
    
      
        
    
          
  373. 
            
            

            

              # :failed_attempts = Locks an account after a number of failed attempts to sign in.
          
    374. 
        
    
      
        
    
          
  374. 
            
            

            

              # :none            = No lock strategy. You should handle locking by yourself.
          
    375. 
        
    
      
        
    
          
  375. 
            
            

            

              # config.lock_strategy = :failed_attempts
          
    376. 
        
    
      
        
    
          
  376. 
            
            

            

            
          
    377. 
        
    
      
        
    
          
  377. 
            
            

            

              # Defines which key will be used when locking and unlocking an account
          
    378. 
        
    
      
        
    
          
  378. 
            
            

            

              # config.unlock_keys = [:email]
          
    379. 
        
    
      
        
    
          
  379. 
            
            

            

            
          
    380. 
        
    
      
        
    
          
  380. 
            
            

            

              # Defines which strategy will be used to unlock an account.
          
    381. 
        
    
      
        
    
          
  381. 
            
            

            

              # :email = Sends an unlock link to the user email
          
    382. 
        
    
      
        
    
          
  382. 
            
            

            

              # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
          
    383. 
        
    
      
        
    
          
  383. 
            
            

            

              # :both  = Enables both strategies
          
    384. 
        
    
      
        
    
          
  384. 
            
            

            

              # :none  = No unlock strategy. You should handle unlocking by yourself.
          
    385. 
        
    
      
        
    
          
  385. 
            
            

            

              # config.unlock_strategy = :both
          
    386. 
        
    
      
        
    
          
  386. 
            
            

            

            
          
    387. 
        
    
      
        
    
          
  387. 
            
            

            

              # Number of authentication tries before locking an account if lock_strategy
          
    388. 
        
    
      
        
    
          
  388. 
            
            

            

              # is failed attempts.
          
    389. 
        
    
      
        
    
          
  389. 
            
            

            

              # config.maximum_attempts = 20
          
    390. 
        
    
      
        
    
          
  390. 
            
            

            

            
          
    391. 
        
    
      
        
    
          
  391. 
            
            

            

              # Time interval to unlock the account if :time is enabled as unlock_strategy.
          
    392. 
        
    
      
        
    
          
  392. 
            
            

            

              # config.unlock_in = 1.hour
          
    393. 
        
    
      
        
    
          
  393. 
            
            

            

            
          
    394. 
        
    
      
        
    
          
  394. 
            
            

            

              # Warn on the last attempt before the account is locked.
          
    395. 
        
    
      
        
    
          
  395. 
            
            

            

              # config.last_attempt_warning = true
          
    396. 
        
    
      
        
    
          
  396. 
            
            

            

            
          
    397. 
        
    
      
        
    
          
  397. 
            
            

            

              # ==> Configuration for :recoverable
          
    398. 
        
    
      
        
    
          
  398. 
            
            

            

              #
          
    399. 
        
    
      
        
    
          
  399. 
            
            

            

              # Defines which key will be used when recovering the password for an account
          
    400. 
        
    
      
        
    
          
  400. 
            
            

            

              # config.reset_password_keys = [:email]
          
    401. 
        
    
      
        
    
          
  401. 
            
            

            

            
          
    402. 
        
    
      
        
    
          
  402. 
            
            

            

              # Time interval you can reset your password with a reset password key.
          
    403. 
        
    
      
        
    
          
  403. 
            
            

            

              # Don't put a too small interval or your users won't have the time to
          
    404. 
        
    
      
        
    
          
  404. 
            
            

            

              # change their passwords.
          
    405. 
        
    
      
        
    
          
  405. 
            1
            

            

              config.reset_password_within = 6.hours
          
    406. 
        
    
      
        
    
          
  406. 
            
            

            

            
          
    407. 
        
    
      
        
    
          
  407. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
    408. 
        
    
      
        
    
          
  408. 
            
            

            

              # reset. Defaults to true, so a user is signed in automatically after a reset.
          
    409. 
        
    
      
        
    
          
  409. 
            
            

            

              # config.sign_in_after_reset_password = true
          
    410. 
        
    
      
        
    
          
  410. 
            
            

            

            
          
    411. 
        
    
      
        
    
          
  411. 
            
            

            

              # ==> Configuration for :encryptable
          
    412. 
        
    
      
        
    
          
  412. 
            
            

            

              # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
          
    413. 
        
    
      
        
    
          
  413. 
            
            

            

              # You can use :sha1, :sha512 or algorithms from others authentication tools as
          
    414. 
        
    
      
        
    
          
  414. 
            
            

            

              # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
          
    415. 
        
    
      
        
    
          
  415. 
            
            

            

              # for default behavior) and :restful_authentication_sha1 (then you should set
          
    416. 
        
    
      
        
    
          
  416. 
            
            

            

              # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
          
    417. 
        
    
      
        
    
          
  417. 
            
            

            

              #
          
    418. 
        
    
      
        
    
          
  418. 
            
            

            

              # Require the `devise-encryptable` gem when using anything other than bcrypt
          
    419. 
        
    
      
        
    
          
  419. 
            
            

            

              # config.encryptor = :sha512
          
    420. 
        
    
      
        
    
          
  420. 
            
            

            

            
          
    421. 
        
    
      
        
    
          
  421. 
            
            

            

              # ==> Scopes configuration
          
    422. 
        
    
      
        
    
          
  422. 
            
            

            

              # Turn scoped views on. Before rendering "sessions/new", it will first check for
          
    423. 
        
    
      
        
    
          
  423. 
            
            

            

              # "users/sessions/new". It's turned off by default because it's slower if you
          
    424. 
        
    
      
        
    
          
  424. 
            
            

            

              # are using only default views.
          
    425. 
        
    
      
        
    
          
  425. 
            
            

            

              # config.scoped_views = false
          
    426. 
        
    
      
        
    
          
  426. 
            
            

            

            
          
    427. 
        
    
      
        
    
          
  427. 
            
            

            

              # Configure the default scope given to Warden. By default it's the first
          
    428. 
        
    
      
        
    
          
  428. 
            
            

            

              # devise role declared in your routes (usually :user).
          
    429. 
        
    
      
        
    
          
  429. 
            
            

            

              # config.default_scope = :user
          
    430. 
        
    
      
        
    
          
  430. 
            
            

            

            
          
    431. 
        
    
      
        
    
          
  431. 
            
            

            

              # Set this configuration to false if you want /users/sign_out to sign out
          
    432. 
        
    
      
        
    
          
  432. 
            
            

            

              # only the current scope. By default, Devise signs out all scopes.
          
    433. 
        
    
      
        
    
          
  433. 
            
            

            

              # config.sign_out_all_scopes = true
          
    434. 
        
    
      
        
    
          
  434. 
            
            

            

            
          
    435. 
        
    
      
        
    
          
  435. 
            
            

            

              # ==> Navigation configuration
          
    436. 
        
    
      
        
    
          
  436. 
            
            

            

              # Lists the formats that should be treated as navigational. Formats like
          
    437. 
        
    
      
        
    
          
  437. 
            
            

            

              # :html, should redirect to the sign in page when the user does not have
          
    438. 
        
    
      
        
    
          
  438. 
            
            

            

              # access, but formats like :xml or :json, should return 401.
          
    439. 
        
    
      
        
    
          
  439. 
            
            

            

              #
          
    440. 
        
    
      
        
    
          
  440. 
            
            

            

              # If you have any extra navigational formats, like :iphone or :mobile, you
          
    441. 
        
    
      
        
    
          
  441. 
            
            

            

              # should add them to the navigational formats lists.
          
    442. 
        
    
      
        
    
          
  442. 
            
            

            

              #
          
    443. 
        
    
      
        
    
          
  443. 
            
            

            

              # The "*/*" below is required to match Internet Explorer requests.
          
    444. 
        
    
      
        
    
          
  444. 
            
            

            

              # config.navigational_formats = ['*/*', :html]
          
    445. 
        
    
      
        
    
          
  445. 
            
            

            

            
          
    446. 
        
    
      
        
    
          
  446. 
            
            

            

              # The default HTTP method used to sign out a resource. Default is :delete.
          
    447. 
        
    
      
        
    
          
  447. 
            1
            

            

              config.sign_out_via = :delete
          
    448. 
        
    
      
        
    
          
  448. 
            
            

            

            
          
    449. 
        
    
      
        
    
          
  449. 
            
            

            

              # ==> OmniAuth
          
    450. 
        
    
      
        
    
          
  450. 
            
            

            

              # Add a new OmniAuth provider. Check the wiki for more information on setting
          
    451. 
        
    
      
        
    
          
  451. 
            
            

            

              # up on your models and hooks.
          
    452. 
        
    
      
        
    
          
  452. 
            
            

            

              # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
          
    453. 
        
    
      
        
    
          
  453. 
            
            

            

            
          
    454. 
        
    
      
        
    
          
  454. 
            
            

            

              # ==> Warden configuration
          
    455. 
        
    
      
        
    
          
  455. 
            
            

            

              # If you want to use other strategies, that are not supported by Devise, or
          
    456. 
        
    
      
        
    
          
  456. 
            
            

            

              # change the failure app, you can configure them inside the config.warden block.
          
    457. 
        
    
      
        
    
          
  457. 
            
            

            

              #
          
    458. 
        
    
      
        
    
          
  458. 
            
            

            

              # config.warden do |manager|
          
    459. 
        
    
      
        
    
          
  459. 
            
            

            

              #   manager.intercept_401 = false
          
    460. 
        
    
      
        
    
          
  460. 
            
            

            

              #   manager.default_strategies(scope: :user).unshift :some_external_strategy
          
    461. 
        
    
      
        
    
          
  461. 
            
            

            

              # end
          
    462. 
        
    
      
        
    
          
  462. 
            
            

            

            
          
    463. 
        
    
      
        
    
          
  463. 
            
            

            

              # ==> Mountable engine configurations
          
    464. 
        
    
      
        
    
          
  464. 
            
            

            

              # When using Devise inside an engine, let's call it `MyEngine`, and this engine
          
    465. 
        
    
      
        
    
          
  465. 
            
            

            

              # is mountable, there are some extra configurations to be taken into account.
          
    466. 
        
    
      
        
    
          
  466. 
            
            

            

              # The following options are available, assuming the engine is mounted as:
          
    467. 
        
    
      
        
    
          
  467. 
            
            

            

              #
          
    468. 
        
    
      
        
    
          
  468. 
            
            

            

              #     mount MyEngine, at: '/my_engine'
          
    469. 
        
    
      
        
    
          
  469. 
            
            

            

              #
          
    470. 
        
    
      
        
    
          
  470. 
            
            

            

              # The router that invoked `devise_for`, in the example above, would be:
          
    471. 
        
    
      
        
    
          
  471. 
            
            

            

              # config.router_name = :my_engine
          
    472. 
        
    
      
        
    
          
  472. 
            
            

            

              #
          
    473. 
        
    
      
        
    
          
  473. 
            
            

            

              # When using OmniAuth, Devise cannot automatically set OmniAuth path,
          
    474. 
        
    
      
        
    
          
  474. 
            
            

            

              # so you need to do it manually. For the users scope, it would be:
          
    475. 
        
    
      
        
    
          
  475. 
            
            

            

              # config.omniauth_path_prefix = '/my_engine/users/auth'
          
    476. 
        
    
      
        
    
          
  476. 
            
            

            

            
          
    477. 
        
    
      
        
    
          
  477. 
            
            

            

              # ==> Turbolinks configuration
          
    478. 
        
    
      
        
    
          
  478. 
            
            

            

              # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
          
    479. 
        
    
      
        
    
          
  479. 
            
            

            

              #
          
    480. 
        
    
      
        
    
          
  480. 
            
            

            

              # ActiveSupport.on_load(:devise_failure_app) do
          
    481. 
        
    
      
        
    
          
  481. 
            
            

            

              #   include Turbolinks::Controller
          
    482. 
        
    
      
        
    
          
  482. 
            
            

            

              # end
          
    483. 
        
    
      
        
    
          
  483. 
            
            

            

            
          
    484. 
        
    
      
        
    
          
  484. 
            
            

            

              # ==> Configuration for :registerable
          
    485. 
        
    
      
        
    
          
  485. 
            
            

            

            
          
    486. 
        
    
      
        
    
          
  486. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
    487. 
        
    
      
        
    
          
  487. 
            
            

            

              # changed. Defaults to true, so a user is signed in automatically after changing a password.
          
    488. 
        
    
      
        
    
          
  488. 
            
            

            

              # config.sign_in_after_change_password = true
          
    489. 
        
    
      
        
    
          
  489. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            end
          
    490.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/filter_parameter_logging.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # Configure sensitive parameters which will be filtered from the log file.
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            Rails.application.config.filter_parameters += %i[
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

              passw secret token _key crypt salt certificate otp ssn
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            ]
          
    7.

config/initializers/inflections.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # Add new inflection rules using the following format. Inflections
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # are locale specific, and you may define rules for as many different
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            # locales as you wish. All of these examples are active by default:
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            # ActiveSupport::Inflector.inflections(:en) do |inflect|
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            #   inflect.plural /^(ox)$/i, '\1en'
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            #   inflect.singular /^(ox)en/i, '\1'
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            #   inflect.irregular 'person', 'people'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            #   inflect.uncountable %w( fish sheep )
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            # end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            # These inflection rules are supported but not enabled by default:
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            # ActiveSupport::Inflector.inflections(:en) do |inflect|
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            #   inflect.acronym 'RESTful'
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            # end
          
    17.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/kaminari.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            Kaminari.configure do |config|
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.page_method_name = :per_page_kaminari
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/mime_types.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # Add new mime types for use in respond_to blocks:
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # Mime::Type.register "text/richtext", :rtf
          
    5.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b6a32ab (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 27ceb6f (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) =======
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) =======
>>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)

config/initializers/money.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            Money.locale_backend = :i18n
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            Money.default_currency = Money::Currency.new('EUR')
          
    4.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/omniauth.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d780a52 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> d52ad35 (Rebased) ======= 2 relevant lines. 2 lines covered and >>>>>>> df37394 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1d59aaa (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 715fac2 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1ac6be1 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 3dc272d (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            OmniAuth.config.logger = Rails.logger
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            Rails.application.config.middleware.use OmniAuth::Builder do
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
=======
          
  5. 
>>>>>>> d96cf3b (Featire specs)
=======
          
  6. 
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
          
  7. 
=======
          
  8. 
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
          
  9. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
          
  10. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
          
  11. 
>>>>>>> d52ad35 (Rebased)
=======
          
  12. 
>>>>>>> df37394 (Featire specs)
=======
          
  13. 
>>>>>>> ee78f39 (Rebased)
=======
          
  14. 
=======
          
  15. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
=======
          
  16. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
          
  17. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
  18. 
>>>>>>> 49e8a6c (Rebased)
=======
          
  19. 
=======
          
  20. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
=======
          
  21. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
          
  22. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
=======
          
  23. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
          
  24. 
>>>>>>> 1d59aaa (Fix)
=======
          
  25. 
>>>>>>> 715fac2 (Featire specs)
=======
          
  26. 
>>>>>>> 836a973 (Rebased)
=======
          
  27. 
=======
          
  28. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
=======
          
  29. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
          
  30. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
          
  31. 
>>>>>>> 078304c (Rebased)
=======
          
  32. 
=======
          
  33. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
          
  34. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
          
  35. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
=======
          
  36. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
          
  37. 
>>>>>>> 0b5b269 (Fix)
=======
          
  38. 
=======
          
  39. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
=======
          
  40. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
=======
          
  41. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
          
  42. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
          
  43. 
>>>>>>> 1ac6be1 (Fix)
=======
          
  44. 
>>>>>>> 3dc272d (Featire specs)
=======
          
  45. 
>>>>>>> 1577aeb (Rebased)
=======
          
  46. 
=======
          
  47. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
          
  48. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
          
  49. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
          
  50. 
>>>>>>> bebaea7 (Rebased)
=======
          
  51. 
=======
          
  52. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
          
  53. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
          
  54. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
          
  55. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
          
  56. 
>>>>>>> 1a9aba9 (Fix)
=======
          
  57. 
=======
          
  58. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
          
  59. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
          
  60. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
          
  61. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
          
  62. 
>>>>>>> 49e3b70 (Fix)
=======
          
  63. 
=======
          
  64. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
          
  65. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
=======
          
  66. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
          
  67. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
          
  68. 
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> d96cf3b (Featire specs)
=======
              provider :facebook,
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
              provider :facebook,
>>>>>>> d52ad35 (Rebased)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> df37394 (Featire specs)
=======
              provider :facebook,
>>>>>>> ee78f39 (Rebased)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 49e8a6c (Rebased)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 1d59aaa (Fix)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 715fac2 (Featire specs)
=======
              provider :facebook,
>>>>>>> 836a973 (Rebased)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 078304c (Rebased)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 0b5b269 (Fix)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 1ac6be1 (Fix)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 3dc272d (Featire specs)
=======
              provider :facebook,
>>>>>>> 1577aeb (Rebased)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> bebaea7 (Rebased)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 1a9aba9 (Fix)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 49e3b70 (Fix)
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
              provider :facebook,
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    69. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 282f108 (Add login registration pages)
=======
>>>>>>> db0e854 (Add login registration pages)
=======
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 01d9256 (Add login registration pages)
=======
>>>>>>> b26425c (Add login registration pages)
=======
>>>>>>> 845289f (Add login registration pages)
=======
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
>>>>>>> 055b00f (Add login registration pages)
=======
>>>>>>> e7ec208 (Add login registration pages)
=======
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
  69. 
            
            

            

                       Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

                       Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
=======
                       scope: 'email', info_fields: 'email,name'
>>>>>>> 836a973 (Rebased)
=======
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
>>>>>>> 0b5b269 (Fix)
=======
                       scope: 'email', info_fields: 'email,name'
>>>>>>> 1577aeb (Rebased)
=======
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
>>>>>>> 1a9aba9 (Fix)
          
    72. 
        
    
      
        
    
          
  72. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  73. 
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> d780a52 (Rebased)
=======
=======
          
  74. 
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
          
  75. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
          
  76. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
          
  77. 
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  78. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
=======
          
  79. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
          
  80. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
          
  81. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
=======
=======
          
  82. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
          
  83. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
=======
          
  84. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
          
  85. 
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
          
  86. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
=======
          
  87. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
          
  88. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
=======
          
  89. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
          
  90. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> af9487a (Add login registration pages)
=======
=======
          
  91. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 140c987 (Add login registration pages)
=======
=======
          
  92. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  93. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 282f108 (Add login registration pages)
=======
=======
          
  94. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> db0e854 (Add login registration pages)
=======
=======
          
  95. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 2cdd6f4 (Add login registration pages)
=======
=======
          
  96. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 3a43955 (Add login registration pages)
=======
>>>>>>> 1ac6be1 (Fix)
=======
          
  97. 
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
          
  98. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 2471c87 (Add login registration pages)
=======
=======
          
  99. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 65459e8 (Add login registration pages)
=======
=======
          
  100. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  101. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> aeec696 (Add login registration pages)
=======
=======
          
  102. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b5affcb (Add login registration pages)
=======
=======
          
  103. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 4f7c979 (Add login registration pages)
=======
=======
          
  104. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  105. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 01d9256 (Add login registration pages)
=======
=======
          
  106. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> b26425c (Add login registration pages)
=======
=======
          
  107. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 845289f (Add login registration pages)
=======
=======
          
  108. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 569a007 (Add login registration pages)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  109. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
          
  110. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 055b00f (Add login registration pages)
=======
=======
          
  111. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e7ec208 (Add login registration pages)
=======
=======
          
  112. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 61908af (Add login registration pages)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

            end
          
    113.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/permissions_policy.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Define an application-wide HTTP permissions policy. For further
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            # information see https://developers.google.com/web/updates/2018/06/feature-policy
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            #
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # Rails.application.config.permissions_policy do |f|
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            #   f.camera      :none
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            #   f.gyroscope   :none
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            #   f.microphone  :none
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            #   f.usb         :none
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            #   f.fullscreen  :self
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            #   f.payment     :self, "https://secure.example.com"
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            # end
          
    12.

config/initializers/wrap_parameters.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            # This file contains settings for ActionController::ParamsWrapper which
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            # is enabled by default.
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

            ActiveSupport.on_load(:action_controller) do
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

              wrap_parameters format: [:json]
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            # To enable root element in JSON for ActiveRecord objects.
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            # ActiveSupport.on_load(:active_record) do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            #   self.include_root_in_json = true
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            # end
          
    15.

config/routes.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> af9487a (Add login registration pages) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 1a9aba9 (Fix) ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) 17 relevant lines. 17 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 01d9256 (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> ea0650c (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> b26425c (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> a038b16 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> 845289f (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> d7fadcd (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 569a007 (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 49e3b70 (Fix) ======= 18 relevant lines. 18 lines covered and >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) 18 relevant lines. 18 lines covered and >>>>>>> 78d0719 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            require 'sidekiq/web'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            Rails.application.routes.draw do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 0edd9b7 (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 089f8cf (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 69eb97e (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
              root 'home#index'
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

<<<<<<< HEAD
              resources :books, only: %i[show index]
=======
              root 'home#index'
<<<<<<< HEAD
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 69eb97e (Add login registration pages)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

<<<<<<< HEAD
=======
>>>>>>> 4552227 (Featire specs)
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
          
    9. 
        
    
      
        
    
<<<<<<< HEAD
          
  9. 
=======
          
  10. 
>>>>>>> 4552227 (Featire specs)
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

=======
>>>>>>> 69eb97e (Add login registration pages)
              resources :books, only: %i[show index]
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              context 'when decorate' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it '#full_name' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.
<<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
          
  7. 
            2
=======
          
  8. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
          
  10. 
            1
            

            

              context 'when decorate' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                it '#full_name' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 998f08d (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
=======
            RSpec.describe BookDecorator do
>>>>>>> fd6db03 (Manifest_cache true)
=======
            RSpec.describe BookDecorator do
>>>>>>> 998f08d (Manifest_cache true)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
            2
=======
          
  5. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  6. 
            3
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> fd6db03 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            2
=======
          
  9. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  10. 
            1
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 998f08d (Manifest_cache true)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
=======
                [
>>>>>>> 998f08d (Manifest_cache true)
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
            1
            

            

              context 'when decorate' do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                it '#full_name' do
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

spec/decorators/book_decorator_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
=======
=======
>>>>>>> 1a9aba9 (Fix)
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              root 'home#index'
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
              devise_for :users
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              root 'home#index'
>>>>>>> fb10fe4 (Add login registration pages)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
          
  5. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              resources :books, only: %i[show index]
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.
<<<<<<< HEAD =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
>>>>>>> fb10fe4 (Add login registration pages)
>>>>>>> 591c3b2 (Add login registration pages)
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
            Rails.application.routes.draw do
=======
            RSpec.describe AuthorDecorator do
>>>>>>> fb10fe4 (Add login registration pages)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 591c3b2 (Add login registration pages)
          
  4. 
            1
=======
          
  5. 
            2
>>>>>>> fb10fe4 (Add login registration pages)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 2471c87 (Add login registration pages)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 65459e8 (Add login registration pages)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> cb955a0 (Add login registration pages)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> aeec696 (Add login registration pages)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> b5affcb (Add login registration pages)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 4f7c979 (Add login registration pages)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 60943cc (Add login registration pages)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 591c3b2 (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 27ceb6f (Add login registration pages)
              root 'home#index'
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
              ActiveAdmin.routes(self)
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 4552227 (Featire specs)
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 7c4ea7f (Fix)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 8f1bc14 (Fix)
=======
              let(:decorator) { described_class.new(author) }
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> fb10fe4 (Add login registration pages)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              context 'when decorate' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                it '#full_name' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              resources :books, only: %i[show index]
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
            end
          
    15.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
=======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              context 'when decorate' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it '#full_name' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======
======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
          
  7. 
            2
=======
          
  8. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
          
  10. 
            1
=======
          
  11. 
            2
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

              context 'when decorate' do
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
          
  12. 
            1
=======
          
  13. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

                it '#full_name' do
          
    14. 
        
    
      
        
    
<<<<<<< HEAD
          
  14. 
            1
=======
          
  15. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
          
  17. 
            
=======
          
  18. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
=======
          
  5. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
          
  6. 
=======
          
  7. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
          
  8. 
            2
=======
          
  9. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              context 'when decorate' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                it '#full_name' do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                end
          
    15. 
        
    
      
        
    
          
  15. 
=======
          
  16. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
          
  17. 
            
            

            

<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
    18.
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
=======
          
  6. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    7. 
        
    
      
        
    
          
  7. 
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

=======
>>>>>>> 4552227 (Featire specs)
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
          
  11. 
=======
          
  12. 
>>>>>>> 4552227 (Featire specs)
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              resources :books, only: %i[show index]
=======
=======
<<<<<<< HEAD
              root 'home#index'
>>>>>>> 3dc272d (Featire specs)
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

=======
<<<<<<< HEAD
>>>>>>> 27ceb6f (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
              resources :books, only: %i[show index]
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  16. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
          
  17. 
=======
          
  18. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  19. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
            
            

            

            end
          
    20.
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              root 'home#index'
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              resources :orders, only: %i[index] do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                get '/add_to_order', to: 'order_books#add_to_order'
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                put '/order_update_book', to: 'order_books#update_quantity'
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              get '/coupon_check', to: 'coupons#find'
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              resources :users
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              resources :books, only: %i[show index] do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                resources :reviews, only: :create
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            end
          
    26.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
          
  7. 
            2
=======
          
  8. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
          
  10. 
            1
            

            

              context 'when decorate' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                it '#full_name' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 998f08d (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
=======
            RSpec.describe BookDecorator do
>>>>>>> fd6db03 (Manifest_cache true)
=======
            RSpec.describe BookDecorator do
>>>>>>> 998f08d (Manifest_cache true)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
            2
=======
          
  5. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  6. 
            3
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> fd6db03 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            2
=======
          
  9. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  10. 
            1
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 998f08d (Manifest_cache true)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
=======
                [
>>>>>>> 998f08d (Manifest_cache true)
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
            1
            

            

              context 'when decorate' do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                it '#full_name' do
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.
======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cde4834 (Manifest_cache true)
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0c3a150 (Add login registration pages)
              root 'home#index'
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e50f73e (Add login registration pages)
=======
              root 'home#index'
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
              devise_for :users
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
              root 'home#index'
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
              root 'home#index'
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
              devise_for :users
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b6a32ab (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 264ef06 (Add login registration pages)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 904663c (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8be9029 (Add login registration pages)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a1a8477 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> e5752db (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551615f (Add login registration pages)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> e50f73e (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 039806b (Add login registration pages)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 45f9f35 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 697ad44 (Add login registration pages)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> af9487a (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 140c987 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 0c3a150 (Add login registration pages)
          
    3. 
        
    
      
        
    
          
  3. 
=======
          
  4. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
            Rails.application.routes.draw do
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              root 'home#index'
=======
              ActiveAdmin.routes(self)
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> 264ef06 (Add login registration pages)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> a1a8477 (Add login registration pages)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 551615f (Add login registration pages)
=======
>>>>>>> d52ad35 (Rebased)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> cb74525 (Add login registration pages)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 8be9029 (Add login registration pages)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 039806b (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 45f9f35 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 697ad44 (Add login registration pages)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 0fc3bf0 (Add login registration pages)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> af9487a (Add login registration pages)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 140c987 (Add login registration pages)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0c3a150 (Add login registration pages)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
              root 'home#index'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
              ActiveAdmin.routes(self)
=======
=======
>>>>>>> e50f73e (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
              root 'home#index'
>>>>>>> df37394 (Featire specs)
=======
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
              ActiveAdmin.routes(self)
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 4552227 (Featire specs)
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
              root 'home#index'
>>>>>>> 715fac2 (Featire specs)
=======
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
              ActiveAdmin.routes(self)
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 4552227 (Featire specs)
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 7c4ea7f (Fix)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 8f1bc14 (Fix)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              authenticate :admin_user do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                mount Sidekiq::Web => '/sidekiq'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              ActiveAdmin.routes(self)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              resources :books, only: %i[show index]
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
            end
          
    16.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
=======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              context 'when decorate' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it '#full_name' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              context 'when decorate' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it '#full_name' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
    14.
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              authenticate :admin_user do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                mount Sidekiq::Web => '/sidekiq'
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              ActiveAdmin.routes(self)
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
              resources :books, only: %i[show index]
          
    14. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  14. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
          
  15. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
          
  16. 
=======
          
  17. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  18. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
            
            

            

>>>>>>> 715fac2 (Featire specs)
            end
          
    19.
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
              devise_for :users
=======
              let(:categories) do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
=======
=======
              let(:categories) do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
=======
              devise_for :users
>>>>>>> 8f1bc14 (Fix)
=======
              end
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
            end
          
    8.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 1214e1f (Add login registration pages)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

<<<<<<< HEAD
              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
              authenticate :admin_user do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                mount Sidekiq::Web => '/sidekiq'
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              ActiveAdmin.routes(self)
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              devise_for :users
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              root 'home#index'
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              resource :checkout, only: %i[new create edit show update]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              resources :orders, only: %i[index show update] do
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                get '/add_to_order', to: 'order_books#add_to_order'
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                put '/order_update_book', to: 'order_books#update_quantity'
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              get '/coupon_check', to: 'coupons#find'
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              resources :users
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              resources :books, only: %i[show index] do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                resources :reviews, only: :create
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

              end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            end
          
    35.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix)
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 587ce47 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true)

spec/decorators/author_decorator_spec.rb

======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true)

spec/decorators/book_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 7c4ea7f (Fix)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
  3. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
            

            

            
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
=======
<<<<<<< HEAD
            RSpec.describe BookDecorator do
=======
              let(:author) { create(:author) }
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
          
  5. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              context 'when decorate' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                it '#full_name' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
    15.
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e50f73e (Add login registration pages)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e50f73e (Add login registration pages)
              resources :books, only: %i[show index]
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
>>>>>>> e50f73e (Add login registration pages)
<<<<<<< HEAD
          
  9. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
          
  10. 
=======
          
  11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  12. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
            
            

            

>>>>>>> df37394 (Featire specs)
            end
          
    13.
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
              devise_for :users
=======
              let(:categories) do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3b839af (Manifest_cache true)
=======
=======
              let(:categories) do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
=======
              devise_for :users
>>>>>>> 8f1bc14 (Fix)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              root 'home#index'
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              resource :checkout, only: %i[new create]
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              resources :orders, only: %i[index edit update show] do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                get '/add_to_order', to: 'order_books#add_to_order'
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                put '/order_update_book', to: 'order_books#update_quantity'
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              get '/coupon_check', to: 'coupons#find'
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              resources :users
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              resources :books, only: %i[show index] do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                resources :reviews, only: :create
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 1d59aaa (Fix) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix)

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true)

spec/decorators/author_decorator_spec.rb

======= >>>>>>> b15044a (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 7c4ea7f (Fix)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
  3. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
            

            

            
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
=======
<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> aa7b40c (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              context 'when decorate' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                it '#full_name' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
    15.
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
  5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    6. 
        
    
      
        
    
          
  6. 
<<<<<<< HEAD
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
              resources :books, only: %i[show index]
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b6a32ab (Add login registration pages)
          
  8. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
          
  9. 
=======
          
  10. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  11. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> b6a32ab (Add login registration pages)
            
            

            

            end
          
    12.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              root 'home#index'
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              resources :users
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              resources :books, only: %i[show index] do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                resources :reviews, only: :create
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased)

spec/decorators/author_decorator_spec.rb

=======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> eaef86a (Fix) ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> fd6db03 (Manifest_cache true)
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            2
            

            

              subject(:decorated_object) { described_class.new(author) }
          
    3. 
        
    
      
        
    
          
  3. 
=======
=======
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> 1830ff1 (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
          
  4. 
>>>>>>> d780a52 (Rebased)
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
  5. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:author) { create(:author) }
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  7. 
=======
=======
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
          
  8. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
=======
<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> aa7b40c (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
    9. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  9. 
=======
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
  10. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    11. 
        
    
      
        
    
          
  11. 
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  12. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  13. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  14. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  15. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
          
  16. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  17. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  18. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e654b (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> cae047f (Manifest_cache true)
=======
=======
          
  19. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  20. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  21. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  22. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
            
            

            

            
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  23. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  24. 
=======
<<<<<<< HEAD
          
  25. 
=======
          
  26. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  27. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  28. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  29. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  30. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
            1
            

            

              describe '#full_name' do
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
    32. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  32. 
=======
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  33. 
=======
<<<<<<< HEAD
          
  34. 
=======
          
  35. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  36. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  37. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  38. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  39. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
            

            

                [
          
    40. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  40. 
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  41. 
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
          
  42. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  43. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  44. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  45. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  46. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  47. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
          
  48. 
>>>>>>> c033601 (Rebased)
=======
          
  49. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  50. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  51. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  52. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
          
  54. 
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
            2
=======
          
  55. 
            2
>>>>>>> a5d032d (Fix)
            

            

              subject(:decorated_object) { described_class.new(author) }
          
    56. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  56. 
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  57. 
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
          
  58. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
          
  59. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  60. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
          
  61. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  62. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  63. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  64. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  66. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
          
  67. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
          
  68. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  69. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
          
  70. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
            
            

            

            
          
    71. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  71. 
=======
<<<<<<< HEAD
          
  72. 
=======
          
  73. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  74. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  75. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  76. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  77. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  78. 
            2
=======
          
  79. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
  80. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  81. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  82. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  83. 
            2
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7c4ea7f (Fix)
              let(:author) { create(:author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    84. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  84. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
          
    85. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  85. 
=======
<<<<<<< HEAD
          
  86. 
=======
          
  87. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  88. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  89. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  90. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  91. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  92. 
=======
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
          
  93. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    94. 
        
    
      
        
    
          
  94. 
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  95. 
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  96. 
>>>>>>> 8f1bc14 (Fix)
            
            

            

            
          
    97. 
        
    
      
        
    
          
  97. 
            1
            

            

              describe '#full_name' do
          
    98. 
        
    
      
        
    
          
  98. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
    99. 
        
    
      
        
    
          
  99. 
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
            
            

            

              end
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

            end
          
    101.

spec/decorators/book_decorator_spec.rb

100.0% lines covered

15 relevant lines. 15 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BookDecorator do
          
    2. 
        
    
      
        
    
          
  2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
=======
              root 'home#index'
>>>>>>> cde4834 (Manifest_cache true)
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
              let(:book) do
=======
              resources :books, only: %i[show index]
>>>>>>> cde4834 (Manifest_cache true)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
          
  5. 
=======
          
  6. 
            
            

            

            end
          
    7.

spec/decorators/book_decorator_spec.rb

100.0% lines covered

12 relevant lines. 12 lines covered and ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 7c4ea7f (Fix)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
  3. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
            

            

            
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe BookDecorator do
=======
              let(:author) { create(:author) }
>>>>>>> 8f1bc14 (Fix)
=======
              let(:author) { create(:author) }
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
>>>>>>> cde4834 (Manifest_cache true)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                create(:book, price_cents: 123, authors: authors, categories: categories,
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> cde4834 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
=======
<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> aa7b40c (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  7. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                              categories_count: 0,
=======
            
>>>>>>> cde4834 (Manifest_cache true)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
          
  8. 
            
            

            

                              authors_count: 0)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
=======
          
  11. 
>>>>>>> cde4834 (Manifest_cache true)
            1
            

            

              let(:authors) do
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

                [
          
    14. 
        
    
      
        
    
<<<<<<< HEAD
          
  14. 
            3
=======
          
  15. 
            2
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> cde4834 (Manifest_cache true)
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
          
  16. 
=======
          
  17. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> cde4834 (Manifest_cache true)
          
    18. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  18. 
<<<<<<< HEAD
=======
          
  19. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  20. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
          
  21. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
=======
          
  22. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
          
  23. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
          
  24. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
            
            

            

<<<<<<< HEAD
=======
>>>>>>> 1ac6be1 (Fix)
=======
          
  25. 
>>>>>>> 8f1bc14 (Fix)
=======
          
  26. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

                ]
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
          
  27. 
=======
          
  28. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

              end
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
          
  30. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  31. 
=======
<<<<<<< HEAD
          
  32. 
=======
          
  33. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  34. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  35. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  36. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
=======
=======
>>>>>>> cae047f (Manifest_cache true)
          
  38. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  39. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  40. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  41. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  42. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  43. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  44. 
>>>>>>> cde4834 (Manifest_cache true)
            1
            

            

              let(:categories) do
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
          
  45. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  46. 
=======
<<<<<<< HEAD
          
  47. 
=======
          
  48. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  49. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  50. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  52. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  53. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  54. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  55. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  56. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  57. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  58. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

                [
          
    59. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
          
  59. 
            3
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  60. 
=======
<<<<<<< HEAD
          
  61. 
=======
          
  62. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  63. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  64. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  65. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  66. 
>>>>>>> 022e63e (Manifest_cache true)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
>>>>>>> c033601 (Rebased)
            2
=======
          
  68. 
            2
>>>>>>> a5d032d (Fix)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
          
  69. 
>>>>>>> c033601 (Rebased)
            2
=======
          
  70. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
          
  71. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  72. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  73. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  74. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
          
  75. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
=======
          
  76. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
          
  77. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
          
  78. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  79. 
            3
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
          
  80. 
            2
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              subject(:decorated_object) { described_class.new(author) }
=======
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 2722d07 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
            RSpec.describe BookDecorator do
=======
              let(:author) { create(:author) }
>>>>>>> a5d032d (Fix)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> cde4834 (Manifest_cache true)
          
    81. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  81. 
            3
=======
          
  82. 
            
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> cde4834 (Manifest_cache true)
          
    83. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  83. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  84. 
=======
<<<<<<< HEAD
          
  85. 
=======
          
  86. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  87. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  88. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  89. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  90. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  91. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
          
  92. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
          
  93. 
>>>>>>> a5d032d (Fix)
=======
=======
          
  94. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  95. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    96. 
        
    
      
        
    
          
  96. 
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
          
  97. 
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
            
            

            

            
=======
=======
          
  98. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  99. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  100. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  101. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  102. 
>>>>>>> 998f08d (Manifest_cache true)
=======
          
  103. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

                  create(:category, name: FFaker::Book.genre)
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  104. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  105. 
=======
<<<<<<< HEAD
          
  106. 
=======
          
  107. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  108. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  109. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  110. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  111. 
=======
<<<<<<< HEAD
          
  112. 
>>>>>>> cae047f (Manifest_cache true)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  113. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  114. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  115. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  116. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  117. 
>>>>>>> 7c4ea7f (Fix)
            
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  118. 
            2
=======
          
  119. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
  120. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  121. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  122. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  123. 
            2
>>>>>>> 7c4ea7f (Fix)
=======
          
  124. 
            
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7c4ea7f (Fix)
              let(:author) { create(:author) }
=======
                ]
>>>>>>> cde4834 (Manifest_cache true)
          
    125. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  125. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
          
    126. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  126. 
=======
<<<<<<< HEAD
          
  127. 
=======
          
  128. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  129. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  130. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  131. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  132. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  133. 
=======
=======
>>>>>>> b15044a (Manifest_cache true)
          
  134. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    135. 
        
    
      
        
    
          
  135. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  136. 
>>>>>>> 7c4ea7f (Fix)
=======
=======
=======
          
  137. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  138. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  139. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  140. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  141. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
          
  142. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
=======
          
  143. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
          
  144. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  145. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

            
          
    146. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  146. 
=======
          
  147. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
            1
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
          
  148. 
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  149. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  150. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  151. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  152. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
            1
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
              describe '#full_name' do
=======
              let(:authors) do
=======
              let(:author) { create(:author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
          
    153. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  153. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  154. 
=======
<<<<<<< HEAD
          
  155. 
=======
          
  156. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  157. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  158. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  159. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  160. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
            

            

                [
          
    161. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  161. 
=======
<<<<<<< HEAD
          
  162. 
=======
          
  163. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  164. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  165. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  166. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  167. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
          
  168. 
>>>>>>> c033601 (Rebased)
            2
=======
          
  169. 
            2
>>>>>>> a5d032d (Fix)
            

            

              subject(:decorated_object) { described_class.new(author) }
          
    170. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  170. 
=======
<<<<<<< HEAD
          
  171. 
=======
          
  172. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  173. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  174. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  175. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  176. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  177. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
          
  178. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
          
  179. 
>>>>>>> a5d032d (Fix)
=======
=======
          
  180. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
            
            

            

            
          
    181. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  181. 
=======
<<<<<<< HEAD
          
  182. 
=======
          
  183. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  184. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  185. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  186. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  187. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  188. 
            2
=======
          
  189. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
  190. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  191. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  192. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  193. 
            2
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7c4ea7f (Fix)
              let(:author) { create(:author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    194. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  194. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
          
    195. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  195. 
=======
<<<<<<< HEAD
          
  196. 
=======
          
  197. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  198. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  199. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  200. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  201. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  202. 
=======
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
          
  203. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    204. 
        
    
      
        
    
          
  204. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  205. 
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  206. 
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  207. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            
            

            

            
          
    208. 
        
    
      
        
    
          
  208. 
            1
            

            

              describe '#full_name' do
          
    209. 
        
    
      
        
    
          
  209. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
    210. 
        
    
      
        
    
          
  210. 
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
            
            

            

              end
          
    211. 
        
    
      
        
    
          
  211. 
            
            

            

            end
          
    212.

spec/decorators/book_decorator_spec.rb

100.0% lines covered

15 relevant lines. 15 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BookDecorator do
          
    2. 
        
    
      
        
    
          
  2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              let(:book) do
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                              categories_count: 0,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                              authors_count: 0)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              let(:authors) do
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                [
          
    11. 
        
    
      
        
    
          
  11. 
            3
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  13. 
<<<<<<< HEAD
=======
          
  14. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  15. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  16. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  17. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  18. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  19. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
          
  20. 
>>>>>>> 8f1bc14 (Fix)
            
            

            

                ]
          
    21. 
        
    
      
        
    
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
          
  21. 
=======
          
  22. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            
            

            

                ]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  24. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  25. 
=======
<<<<<<< HEAD
          
  26. 
=======
          
  27. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  28. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  29. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  30. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  31. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  32. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  33. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  34. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  35. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  36. 
>>>>>>> 7c4ea7f (Fix)
            1
            

            

              let(:categories) do
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
          
  37. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  38. 
=======
<<<<<<< HEAD
          
  39. 
=======
          
  40. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  41. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  42. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  43. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  44. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  45. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  46. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  47. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  48. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  49. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

                [
          
    50. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
          
  50. 
            3
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  51. 
=======
<<<<<<< HEAD
          
  52. 
=======
          
  53. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  54. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  55. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  56. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  57. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
  58. 
>>>>>>> c033601 (Rebased)
            2
=======
          
  59. 
            1
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
          
  60. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  61. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  62. 
            2
>>>>>>> a5d032d (Fix)
=======
          
  63. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  64. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  65. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  66. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  67. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  68. 
            3
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 2722d07 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
            RSpec.describe BookDecorator do
=======
              let(:author) { create(:author) }
>>>>>>> a5d032d (Fix)
          
    69. 
        
    
      
        
    
<<<<<<< HEAD
          
  69. 
            3
            

            

<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 7c4ea7f (Fix)
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  70. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  71. 
=======
<<<<<<< HEAD
          
  72. 
=======
          
  73. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  74. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  75. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  76. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  77. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  78. 
>>>>>>> c033601 (Rebased)
=======
          
  79. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    80. 
        
    
      
        
    
          
  80. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  81. 
>>>>>>> a5d032d (Fix)
            
            

            

            
=======
=======
          
  82. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  83. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  84. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  85. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  86. 
>>>>>>> 998f08d (Manifest_cache true)
=======
          
  87. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

                  create(:category, name: FFaker::Book.genre)
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
    88. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  88. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  89. 
=======
<<<<<<< HEAD
          
  90. 
=======
          
  91. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  92. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  93. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  94. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  96. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  97. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  98. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  99. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  100. 
>>>>>>> 7c4ea7f (Fix)
            
=======
          
  101. 
=======
          
  102. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
            1
>>>>>>> c033601 (Rebased)
=======
          
  103. 
            1
>>>>>>> a5d032d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
              describe '#full_name' do
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  104. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  105. 
=======
<<<<<<< HEAD
          
  106. 
=======
          
  107. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  108. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  109. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
          
  110. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d9b13 (Manifest_cache true)
          
  111. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  112. 
=======
          
  113. 
            
            

            

                [
          
    114. 
        
    
      
        
    
          
  114. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  115. 
>>>>>>> a5d032d (Fix)
=======
          
  116. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  117. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
    118. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  118. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
=======
          
  119. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
=======
          
  120. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  121. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
          
  122. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
          
  123. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  124. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
          
  125. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  126. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  127. 
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
          
  128. 
>>>>>>> c033601 (Rebased)
=======
          
  129. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
          
  130. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  131. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
          
  132. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  133. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

              end
          
    134. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
          
  134. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e2bfd89 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d1bae53 (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d9b13 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7f7abc (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
          
  135. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    136. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
          
  136. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  137. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  138. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  139. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  140. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  141. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  142. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  143. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

            
          
    144. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  144. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  145. 
=======
          
  146. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  147. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  148. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  149. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  150. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  151. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  152. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  153. 
>>>>>>> cde4834 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
              describe '#categories_names' do
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              it '#authors_names' do
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> 7c4ea7f (Fix)
=======
              it '#authors_names' do
>>>>>>> cde4834 (Manifest_cache true)
          
    154. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  154. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  155. 
            2
=======
          
  156. 
            1
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  157. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  158. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  159. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  160. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  161. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  162. 
            2
>>>>>>> 7c4ea7f (Fix)
=======
          
  163. 
            1
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 7c4ea7f (Fix)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> cde4834 (Manifest_cache true)
          
    164. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  164. 
=======
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  165. 
            1
=======
          
  166. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  167. 
            
>>>>>>> 998f08d (Manifest_cache true)
=======
          
  168. 
            
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
              end
>>>>>>> 998f08d (Manifest_cache true)
=======
              end
>>>>>>> cde4834 (Manifest_cache true)
          
    169. 
        
    
      
        
    
          
  169. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
          
    170. 
        
    
      
        
    
          
  170. 
            
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
            
          
    171. 
        
    
      
        
    
<<<<<<< HEAD
          
  171. 
            1
            

            

                it '#categories_names' do
          
    172. 
        
    
      
        
    
          
  172. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    173. 
        
    
      
        
    
          
  173. 
            
            

            

                end
          
    174. 
        
    
      
        
    
          
  174. 
=======
          
  175. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
  176. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  177. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  178. 
>>>>>>> 183b6c5 (Manifest_cache true)
            
=======
          
  179. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    180. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
  180. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
  181. 
            
            

            

                end
          
    182. 
        
    
      
        
    
          
  182. 
            
            

            

            
          
    183. 
        
    
      
        
    
          
  183. 
            1
            

            

                it '#categories_names' do
          
    184. 
        
    
      
        
    
          
  184. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    185. 
        
    
      
        
    
          
  185. 
            
            

            

                end
          
    186. 
        
    
      
        
    
          
  186. 
            
            

            

              end
          
    187. 
        
    
      
        
    
<<<<<<< HEAD
          
  187. 
<<<<<<< HEAD
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  188. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
          
  189. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
          
  190. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  191. 
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
          
    192. 
        
    
      
        
    
          
  192. 
            
            

            

                ]
          
    193. 
        
    
      
        
    
          
  193. 
            
            

            

              end
          
    194. 
        
    
      
        
    
          
  194. 
            1
            

            

              let(:categories) do
          
    195. 
        
    
      
        
    
          
  195. 
            
            

            

                [
          
    196. 
        
    
      
        
    
          
  196. 
            2
            

            

                  FactoryBot.create(:category, name: 'Poetry'),
          
    197. 
        
    
      
        
    
          
  197. 
            
            

            

                  FactoryBot.create(:category, name: 'Novel')
          
    198. 
        
    
      
        
    
          
  198. 
            
            

            

                ]
          
    199. 
        
    
      
        
    
          
  199. 
            
            

            

              end
          
    200. 
        
    
      
        
    
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
          
  200. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  201. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  202. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  203. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  204. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  205. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  206. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    207. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  207. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  208. 
=======
          
  209. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  210. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  211. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  212. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  213. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  214. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  215. 
>>>>>>> 7c4ea7f (Fix)
            1
            

            

<<<<<<< HEAD
              context 'when decorate' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
              describe '#categories_names' do
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              it '#authors_names' do
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
              it '#authors_names' do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
              describe '#categories_names' do
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    216. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  216. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  217. 
            2
=======
          
  218. 
            1
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  219. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  220. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  221. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  222. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  223. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  224. 
            2
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
                it '#authors_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    225. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  225. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
          
  226. 
            1
=======
          
  227. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  228. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
              end
>>>>>>> 998f08d (Manifest_cache true)
          
    229. 
        
    
      
        
    
          
  229. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                end
          
    230. 
        
    
      
        
    
          
  230. 
            
            

            

            
          
    231. 
        
    
      
        
    
          
  231. 
            1
            

            

                it '#categories_names' do
          
    232. 
        
    
      
        
    
          
  232. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    233. 
        
    
      
        
    
          
  233. 
            
            

            

                end
          
    234. 
        
    
      
        
    
          
  234. 
<<<<<<< HEAD
=======
=======
          
  235. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
  236. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  237. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  238. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
            
=======
          
  239. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    240. 
        
    
      
        
    
          
  240. 
            
            

            

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
  241. 
            
            

            

                end
          
    242. 
        
    
      
        
    
          
  242. 
            
            

            

            
          
    243. 
        
    
      
        
    
          
  243. 
            1
            

            

                it '#categories_names' do
          
    244. 
        
    
      
        
    
          
  244. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    245. 
        
    
      
        
    
          
  245. 
            
            

            

                end
          
    246. 
        
    
      
        
    
          
  246. 
            
            

            

              end
          
    247. 
        
    
      
        
    
<<<<<<< HEAD
          
  247. 
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  248. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
          
  249. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
          
  250. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  251. 
>>>>>>> a5d032d (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> eaef86a (Fix)
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
          
    252. 
        
    
      
        
    
          
  252. 
            
            

            

                ]
          
    253. 
        
    
      
        
    
          
  253. 
            
            

            

              end
          
    254. 
        
    
      
        
    
          
  254. 
            1
            

            

              let(:categories) do
          
    255. 
        
    
      
        
    
          
  255. 
            
            

            

                [
          
    256. 
        
    
      
        
    
          
  256. 
            2
            

            

                  FactoryBot.create(:category, name: 'Poetry'),
          
    257. 
        
    
      
        
    
          
  257. 
            
            

            

                  FactoryBot.create(:category, name: 'Novel')
          
    258. 
        
    
      
        
    
          
  258. 
            
            

            

                ]
          
    259. 
        
    
      
        
    
          
  259. 
            
            

            

              end
          
    260. 
        
    
      
        
    
          
  260. 
            
            

            

            
          
    261. 
        
    
      
        
    
          
  261. 
            1
            

            

              context 'when decorate' do
          
    262. 
        
    
      
        
    
          
  262. 
            1
            

            

                it '#authors_names' do
          
    263. 
        
    
      
        
    
          
  263. 
            1
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    264. 
        
    
      
        
    
          
  264. 
            
            

            

                end
          
    265. 
        
    
      
        
    
          
  265. 
            
            

            

            
          
    266. 
        
    
      
        
    
          
  266. 
            1
            

            

                it '#categories_names' do
          
    267. 
        
    
      
        
    
          
  267. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    268. 
        
    
      
        
    
          
  268. 
            
            

            

                end
          
    269. 
        
    
      
        
    
          
  269. 
            
            

            

              end
          
    270. 
        
    
      
        
    
          
  270. 
            
            

            

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
            end
          
    271.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
<<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) =======
>>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 0c9131d (Manifest_cache true)
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BookDecorator do
          
    2. 
        
    
      
        
    
          
  2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 75be480 (Manifest_cache true)
              let(:book) do
=======
              resources :books, only: %i[show index]
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
=======
              resources :books, only: %i[show index]
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
            RSpec.describe BookDecorator do
=======
              let(:book) do
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
=======
              resources :books, only: %i[show index]
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
            RSpec.describe BookDecorator do
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
          
    9. 
        
    
      
        
    
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
          
  9. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
    10. 
        
    
      
        
    
          
  10. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  11. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
          
  12. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
          
  13. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              categories_count: 0,
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
=======
                              categories_count: 0,
>>>>>>> a5d032d (Fix)
=======
=======
                              categories_count: 0,
=======
=======
            
=======
                              categories_count: 0,
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
                              categories_count: 0,
=======
<<<<<<< HEAD
=======
            
=======
                              categories_count: 0,
>>>>>>> a5d032d (Fix)
=======
=======
                              categories_count: 0,
=======
=======
            
          
    14. 
        
    
      
        
    
<<<<<<< HEAD
          
  14. 
=======
          
  15. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  16. 
=======
          
  17. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
          
    18. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  18. 
=======
          
  19. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  20. 
=======
          
  21. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  22. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
                              authors_count: 0)
=======
                [
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                [
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                              authors_count: 0)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
=======
                              authors_count: 0)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
                              authors_count: 0)
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
          
    23. 
        
    
      
        
    
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
          
  23. 
=======
          
  24. 
>>>>>>> ae2a012 (Manifest_cache true)
            
=======
          
  25. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  26. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
          
  27. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
          
  28. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
          
  29. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
=======
          
  30. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  31. 
=======
          
  32. 
>>>>>>> ae2a012 (Manifest_cache true)
            
=======
          
  33. 
=======
          
  34. 
>>>>>>> ae2a012 (Manifest_cache true)
            
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
          
  35. 
            
>>>>>>> 5518ff0 (Manifest_cache true)
=======
          
  36. 
            2
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  37. 
            
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
              end
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              end
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
=======
              end
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
              end
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
          
    38. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  38. 
            1
=======
          
  39. 
            
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  40. 
=======
          
  41. 
>>>>>>> ae2a012 (Manifest_cache true)
            2
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  42. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
          
  43. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
          
  44. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
          
  45. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
=======
          
  46. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
          
  47. 
            1
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
              let(:authors) do
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:authors) do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
=======
              let(:authors) do
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  48. 
=======
          
  49. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  50. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  51. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  52. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  53. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  54. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
          
  55. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  56. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  57. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  58. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
                [
          
    59. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  59. 
            3
=======
<<<<<<< HEAD
          
  60. 
=======
          
  61. 
>>>>>>> ae2a012 (Manifest_cache true)
            
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  62. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  63. 
            3
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
    64. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  64. 
=======
          
  65. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  66. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
          
  67. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  68. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
                ]
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
  70. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  71. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
          
  72. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  73. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  74. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  75. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  76. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
          
  77. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
          
  78. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  79. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  80. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  81. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  82. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
            
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
          
  83. 
=======
          
  84. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
  85. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  86. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  87. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  88. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  89. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
            
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> 1577aeb (Rebased)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  90. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  91. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
          
  92. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  93. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
          
  94. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  95. 
=======
          
  96. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
          
  97. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  98. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  99. 
=======
          
  100. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  101. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  102. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
          
  103. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  104. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  105. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  106. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  107. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  108. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  109. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  110. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
  111. 
=======
          
  112. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  113. 
=======
          
  114. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
          
  115. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  116. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  117. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
          
  118. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  119. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
          
  120. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  121. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  122. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  123. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
          
  124. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  125. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
            1
            

            

              let(:categories) do
          
    126. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  126. 
=======
          
  127. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
          
  128. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  129. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  130. 
=======
          
  131. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  132. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  133. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
          
  134. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  135. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  136. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  137. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  138. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  139. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  140. 
>>>>>>> 7c4ea7f (Fix)
=======
          
  141. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
  142. 
=======
          
  143. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  144. 
=======
          
  145. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
          
  146. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  147. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  148. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
          
  149. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  150. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
          
  151. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  152. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  153. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  154. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
          
  155. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  156. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

                [
          
    157. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
          
  157. 
            3
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  158. 
=======
<<<<<<< HEAD
          
  159. 
=======
          
  160. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  161. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  162. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  163. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  164. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
          
  165. 
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
            2
=======
          
  166. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  167. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  168. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  169. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  170. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
          
  171. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
=======
          
  172. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
          
  173. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
          
  174. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  175. 
            3
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  176. 
            3
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  177. 
            3
=======
          
  178. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  179. 
=======
          
  180. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
            2
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
          
  181. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  182. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  183. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  184. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  185. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
              let(:author) { create(:author) }
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 2722d07 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
            RSpec.describe BookDecorator do
=======
              let(:author) { create(:author) }
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
              let(:author) { create(:author) }
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
            RSpec.describe BookDecorator do
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
          
    186. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
          
  186. 
            3
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
          
  187. 
            3
=======
          
  188. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  189. 
=======
          
  190. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
            2
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
          
  191. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  192. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  193. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  194. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  195. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
          
    196. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  196. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  197. 
=======
<<<<<<< HEAD
          
  198. 
=======
          
  199. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  200. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  201. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  202. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  203. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  204. 
>>>>>>> c033601 (Rebased)
=======
          
  205. 
            3
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
          
  206. 
=======
          
  207. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  208. 
=======
          
  209. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
  210. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  211. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  212. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  213. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  214. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
            
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  215. 
=======
          
  216. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  217. 
=======
          
  218. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
  219. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  220. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  221. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  222. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  223. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
            
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
=======
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
          
    224. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  224. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  225. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  226. 
=======
          
  227. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  228. 
=======
          
  229. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  230. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  231. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  232. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  233. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  234. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  235. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  236. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  237. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  238. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

                ]
          
    239. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  239. 
=======
          
  240. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  241. 
=======
          
  242. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  243. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  244. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  245. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  246. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  247. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  248. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  249. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  250. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  251. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

              end
          
    252. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
          
  252. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
          
  253. 
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  254. 
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
          
  255. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    256. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
          
  256. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
          
  257. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  258. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  259. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  260. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  261. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
          
  262. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
          
  263. 
>>>>>>> 1577aeb (Rebased)
=======
          
  264. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
          
  265. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  266. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  267. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  268. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  269. 
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
            
            

            

            
          
    270. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  270. 
=======
<<<<<<< HEAD
          
  271. 
=======
          
  272. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  273. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  274. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  275. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  276. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
=======
          
  277. 
=======
          
  278. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
          
  279. 
=======
          
  280. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
          
  281. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  282. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  283. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  284. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  285. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
            1
>>>>>>> c033601 (Rebased)
=======
          
  286. 
            1
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
          
  287. 
=======
          
  288. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
  289. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  290. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  291. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  292. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  293. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
            1
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
              describe '#full_name' do
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
              describe '#categories_names' do
=======
              it '#authors_names' do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
              describe '#categories_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
              describe '#categories_names' do
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
          
    294. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  294. 
=======
<<<<<<< HEAD
          
  295. 
=======
          
  296. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  297. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  298. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  299. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  300. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  301. 
=======
          
  302. 
            
            

            

                [
          
    303. 
        
    
      
        
    
          
  303. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  304. 
>>>>>>> a5d032d (Fix)
=======
=======
          
  305. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  306. 
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
          
  307. 
>>>>>>> 9bebee5 (Manifest_cache true)
            2
=======
          
  308. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
  309. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  310. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  311. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  312. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  313. 
            2
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  314. 
            2
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
=======
              let(:author) { create(:author) }
>>>>>>> ee78f39 (Rebased)
=======
              let(:author) { create(:author) }
>>>>>>> 836a973 (Rebased)
          
    315. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  315. 
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
          
  316. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  317. 
=======
          
  318. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  319. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  320. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  321. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  322. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  323. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
          
  324. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    325. 
        
    
      
        
    
          
  325. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  326. 
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 836a973 (Rebased)
            
            

            

            
<<<<<<< HEAD
=======
=======
          
  327. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  328. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  329. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  330. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  331. 
>>>>>>> 998f08d (Manifest_cache true)
=======
          
  332. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

                  create(:category, name: FFaker::Book.genre)
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 836a973 (Rebased)
          
    333. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  333. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  334. 
=======
<<<<<<< HEAD
          
  335. 
=======
          
  336. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  337. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  338. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  339. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  340. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  341. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  342. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  343. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  344. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  345. 
>>>>>>> 7c4ea7f (Fix)
            
=======
          
  346. 
<<<<<<< HEAD
=======
          
  347. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
            1
>>>>>>> c033601 (Rebased)
=======
          
  348. 
            1
>>>>>>> a5d032d (Fix)
=======
            1
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 836a973 (Rebased)
              describe '#full_name' do
          
    349. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  349. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  350. 
=======
<<<<<<< HEAD
          
  351. 
=======
          
  352. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  353. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  354. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  355. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  356. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  357. 
=======
          
  358. 
            
            

            

                [
          
    359. 
        
    
      
        
    
          
  359. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  360. 
>>>>>>> a5d032d (Fix)
=======
          
  361. 
>>>>>>> 836a973 (Rebased)
            2
=======
          
  362. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
  363. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  364. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  365. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  366. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  367. 
            2
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
=======
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
    368. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  368. 
            1
=======
          
  369. 
=======
          
  370. 
=======
          
  371. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
            
>>>>>>> fd6db03 (Manifest_cache true)
            

            

<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
          
    372. 
        
    
      
        
    
<<<<<<< HEAD
          
  372. 
=======
<<<<<<< HEAD
          
  373. 
=======
          
  374. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                end
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
          
    375. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  375. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  376. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
=======
=======
          
  377. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
=======
          
  378. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
  379. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
          
  380. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  381. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
          
  382. 
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
          
  383. 
<<<<<<< HEAD
=======
          
  384. 
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
          
  385. 
>>>>>>> a5d032d (Fix)
            
            

            

<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
            
=======
              end
>>>>>>> a5d032d (Fix)
          
    386. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  386. 
            1
            

            

                it '#categories_names' do
          
    387. 
        
    
      
        
    
<<<<<<< HEAD
          
  387. 
=======
          
  388. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
    389. 
        
    
      
        
    
<<<<<<< HEAD
          
  389. 
            
            

            

                end
          
    390. 
        
    
      
        
    
          
  390. 
=======
          
  391. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  392. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  393. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  394. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
            
=======
          
  395. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    396. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  396. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  397. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    398. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  398. 
<<<<<<< HEAD
=======
          
  399. 
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  400. 
>>>>>>> b763f5b (Manifest_cache true)
=======
          
  401. 
>>>>>>> be2f578 (Manifest_cache true)
=======
          
  402. 
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  403. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  404. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  405. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  406. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  407. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  408. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
    409. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  409. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  410. 
=======
          
  411. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  412. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  413. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  414. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  415. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  416. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  417. 
>>>>>>> 7c4ea7f (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
              describe '#categories_names' do
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#categories_names' do
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              it '#authors_names' do
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> 7c4ea7f (Fix)
          
    418. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  418. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  419. 
            2
=======
          
  420. 
            1
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  421. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  422. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  423. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  424. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  425. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  426. 
            2
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 7c4ea7f (Fix)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
    427. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  427. 
=======
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  428. 
            1
=======
          
  429. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  430. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
              end
>>>>>>> 998f08d (Manifest_cache true)
          
    431. 
        
    
      
        
    
          
  431. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
    432. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  432. 
            1
=======
          
  433. 
=======
          
  434. 
=======
          
  435. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  436. 
            1
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
          
  437. 
            
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 75be480 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
              end
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
    438. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  438. 
=======
<<<<<<< HEAD
          
  439. 
=======
          
  440. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  441. 
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
=======
          
  442. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
                end
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
          
    443. 
        
    
      
        
    
<<<<<<< HEAD
          
  443. 
<<<<<<< HEAD
=======
          
  444. 
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
=======
          
  445. 
>>>>>>> a5d032d (Fix)
=======
=======
          
  446. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
            
          
    447. 
        
    
      
        
    
<<<<<<< HEAD
          
  447. 
            1
            

            

                it '#categories_names' do
          
    448. 
        
    
      
        
    
=======
>>>>>>> 1577aeb (Rebased)
          
  448. 
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    449. 
        
    
      
        
    
          
  449. 
            
            

            

                end
          
    450. 
        
    
      
        
    
          
  450. 
=======
          
  451. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
            
=======
              end
>>>>>>> a5d032d (Fix)
          
    452. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  452. 
            1
=======
          
  453. 
=======
          
  454. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> 1c3ace6 (Manifest_cache true)
            

            

                it '#categories_names' do
          
    455. 
        
    
      
        
    
<<<<<<< HEAD
          
  455. 
=======
          
  456. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  457. 
>>>>>>> cde4834 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> 1577aeb (Rebased)
          
    458. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  458. 
            
            

            

                end
          
    459. 
        
    
      
        
    
          
  459. 
=======
          
  460. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
  461. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  462. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  463. 
>>>>>>> 183b6c5 (Manifest_cache true)
            
=======
          
  464. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
            
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
          
    465. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  465. 
            1
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
<<<<<<< HEAD
          
  466. 
=======
          
  467. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> 9bebee5 (Manifest_cache true)
            

            

                it '#categories_names' do
          
    468. 
        
    
      
        
    
<<<<<<< HEAD
          
  468. 
=======
          
  469. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
          
    470. 
        
    
      
        
    
<<<<<<< HEAD
          
  470. 
            
            

            

                end
          
    471. 
        
    
      
        
    
          
  471. 
=======
          
  472. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
  473. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  474. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  475. 
>>>>>>> 183b6c5 (Manifest_cache true)
            
=======
          
  476. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    477. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
  477. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
  478. 
            
            

            

                end
=======
<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
          
    479. 
        
    
      
        
    
<<<<<<< HEAD
          
  479. 
=======
          
  480. 
>>>>>>> 02a399d (Manifest_cache true)
            
            

            

            
=======
              it '#categories_names' do
>>>>>>> cde4834 (Manifest_cache true)
          
    481. 
        
    
      
        
    
          
  481. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
  482. 
=======
          
  483. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  484. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it '#categories_names' do
=======
<<<<<<< HEAD
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> cde4834 (Manifest_cache true)
=======
                it {
>>>>>>> 1577aeb (Rebased)
          
    485. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  485. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    486. 
        
    
      
        
    
          
  486. 
            
            

            

                end
          
    487. 
        
    
      
        
    
          
  487. 
            
            

            

              end
          
    488. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  488. 
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  489. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
          
  490. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
          
  491. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
          
  492. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
          
  493. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
          
  494. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
  495. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
          
    496. 
        
    
      
        
    
          
  496. 
            
            

            

                ]
          
    497. 
        
    
      
        
    
          
  497. 
            
            

            

              end
          
    498. 
        
    
      
        
    
          
  498. 
            1
            

            

              let(:categories) do
          
    499. 
        
    
      
        
    
          
  499. 
            
            

            

                [
          
    500. 
        
    
      
        
    
          
  500. 
            2
            

            

                  FactoryBot.create(:category, name: 'Poetry'),
          
    501. 
        
    
      
        
    
          
  501. 
            
            

            

                  FactoryBot.create(:category, name: 'Novel')
          
    502. 
        
    
      
        
    
          
  502. 
            
            

            

                ]
          
    503. 
        
    
      
        
    
          
  503. 
            
            

            

              end
          
    504. 
        
    
      
        
    
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  504. 
=======
          
  505. 
=======
          
  506. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
            
            

            

            
          
    507. 
        
    
      
        
    
<<<<<<< HEAD
          
  507. 
            1
            

            

<<<<<<< HEAD
              context 'when decorate' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              it '#authors_names' do
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
    508. 
        
    
      
        
    
          
  508. 
            1
            

            

<<<<<<< HEAD
                it '#authors_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
    509. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  509. 
=======
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  510. 
            1
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    511. 
        
    
      
        
    
          
  511. 
            
            

            

                end
          
    512. 
        
    
      
        
    
          
  512. 
            
            

            

            
          
    513. 
        
    
      
        
    
          
  513. 
            1
            

            

                it '#categories_names' do
          
    514. 
        
    
      
        
    
=======
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
          
  514. 
=======
          
  515. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
          
    516. 
        
    
      
        
    
<<<<<<< HEAD
          
  516. 
            
            

            

                end
          
    517. 
        
    
      
        
    
          
  517. 
            
=======
          
  518. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    519. 
        
    
      
        
    
          
  519. 
            
            

            

<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
                end
          
    520. 
        
    
      
        
    
          
  520. 
            
            

            

            
          
    521. 
        
    
      
        
    
          
  521. 
=======
<<<<<<< HEAD
          
  522. 
=======
          
  523. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                it '#categories_names' do
=======
<<<<<<< HEAD
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
          
    524. 
        
    
      
        
    
<<<<<<< HEAD
          
  524. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    525. 
        
    
      
        
    
          
  525. 
            
            

            

                end
          
    526. 
        
    
      
        
    
          
  526. 
            
            

            

              end
          
    527. 
        
    
      
        
    
<<<<<<< HEAD
          
  527. 
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  528. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  529. 
>>>>>>> c033601 (Rebased)
            
            

            

>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
            end
          
    530.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> 836a973 (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BookDecorator do
          
    2. 
        
    
      
        
    
          
  2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
              let(:book) do
=======
              resources :books, only: %i[show index]
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
=======
              resources :books, only: %i[show index]
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) do
>>>>>>> a5d032d (Fix)
=======
              let(:book) do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
=======
              resources :books, only: %i[show index]
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) do
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
            RSpec.describe BookDecorator do
=======
              let(:book) do
>>>>>>> 836a973 (Rebased)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
          
  5. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
          
  8. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
    9. 
        
    
      
        
    
          
  9. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  10. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
  11. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              categories_count: 0,
=======
<<<<<<< HEAD
=======
            
=======
                              categories_count: 0,
>>>>>>> a5d032d (Fix)
=======
                              categories_count: 0,
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
                              categories_count: 0,
=======
<<<<<<< HEAD
=======
            
=======
                              categories_count: 0,
>>>>>>> a5d032d (Fix)
=======
=======
                              categories_count: 0,
=======
=======
            
=======
                              categories_count: 0,
>>>>>>> 836a973 (Rebased)
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
    14. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  14. 
=======
          
  15. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  16. 
=======
          
  17. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
          
    18. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
          
  18. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
                              authors_count: 0)
=======
                [
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                [
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                              authors_count: 0)
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
                              authors_count: 0)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
                              authors_count: 0)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
                              authors_count: 0)
>>>>>>> 836a973 (Rebased)
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
          
  19. 
=======
          
  20. 
>>>>>>> ae2a012 (Manifest_cache true)
            
=======
          
  21. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  22. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
          
  23. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
          
  24. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  25. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  26. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  27. 
=======
          
  28. 
>>>>>>> ae2a012 (Manifest_cache true)
            
>>>>>>> ee78f39 (Rebased)
=======
          
  29. 
=======
          
  30. 
>>>>>>> ae2a012 (Manifest_cache true)
            
=======
=======
          
  31. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  32. 
            2
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  33. 
            
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
              end
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              end
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
              end
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
              end
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
              end
>>>>>>> 836a973 (Rebased)
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  34. 
            1
=======
          
  35. 
            
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  36. 
=======
          
  37. 
>>>>>>> ae2a012 (Manifest_cache true)
            2
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  38. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
          
  39. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
          
  40. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  41. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  42. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  43. 
            1
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  44. 
            1
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
              let(:authors) do
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:authors) do
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
              let(:authors) do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 836a973 (Rebased)
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  45. 
=======
          
  46. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  47. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  48. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  49. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  50. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  52. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  53. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  54. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  55. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  56. 
>>>>>>> 836a973 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
                [
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  57. 
            3
=======
<<<<<<< HEAD
          
  58. 
=======
          
  59. 
>>>>>>> ae2a012 (Manifest_cache true)
            
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  60. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  61. 
            3
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  62. 
            3
>>>>>>> 836a973 (Rebased)
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
    63. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  63. 
=======
          
  64. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  65. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  66. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  67. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  68. 
>>>>>>> 836a973 (Rebased)
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
                ]
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
          
  70. 
=======
          
  71. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  72. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  73. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  74. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  75. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  76. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  77. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
          
  78. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  79. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  80. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
            
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  81. 
            
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> 836a973 (Rebased)
          
    82. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
=======
=======
          
  82. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> add330c (Manifest_cache true)
=======
          
  83. 
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
          
  84. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  85. 
=======
          
  86. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  87. 
=======
          
  88. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  89. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  90. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  91. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  92. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  93. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  94. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  95. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  96. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  97. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  98. 
>>>>>>> 836a973 (Rebased)
            1
            

            

              let(:categories) do
          
    99. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  99. 
=======
          
  100. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  101. 
=======
          
  102. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  103. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  104. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  105. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  106. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  107. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  108. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  109. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  110. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  111. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  112. 
>>>>>>> 836a973 (Rebased)
            
            

            

                [
          
    113. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  113. 
            3
=======
          
  114. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  115. 
=======
          
  116. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  117. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
          
  118. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
          
  119. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  120. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  121. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  122. 
            3
>>>>>>> ee78f39 (Rebased)
=======
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  123. 
            3
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre),
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 836a973 (Rebased)
          
    124. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  124. 
=======
          
  125. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  126. 
=======
          
  127. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  128. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  129. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  130. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  131. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  132. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  133. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  134. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  135. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  136. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  137. 
>>>>>>> 836a973 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 836a973 (Rebased)
          
    138. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  138. 
=======
          
  139. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  140. 
=======
          
  141. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  142. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  143. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  144. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  145. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  146. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  147. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  148. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  149. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  150. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  151. 
>>>>>>> 836a973 (Rebased)
            
            

            

                ]
          
    152. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  152. 
=======
          
  153. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  154. 
=======
          
  155. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  156. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  157. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  158. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  159. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  160. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  161. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  162. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  163. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  164. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
          
  165. 
>>>>>>> 836a973 (Rebased)
            
            

            

              end
          
    166. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  166. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  167. 
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  168. 
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  169. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
    170. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  170. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  171. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  172. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  173. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  174. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  175. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  176. 
>>>>>>> ee78f39 (Rebased)
=======
          
  177. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
          
  178. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
          
  179. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  180. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  181. 
>>>>>>> 836a973 (Rebased)
            
            

            

            
=======
              end
>>>>>>> 0b5b269 (Fix)
          
    182. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
          
  182. 
=======
          
  183. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  184. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  185. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  186. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  187. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  188. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
          
  189. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
          
  190. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  191. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  192. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  193. 
>>>>>>> 836a973 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
              describe '#categories_names' do
=======
              it '#authors_names' do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe '#categories_names' do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> 836a973 (Rebased)
          
    194. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
          
  194. 
            2
=======
          
  195. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  196. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
          
  197. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
          
  198. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  199. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  200. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  201. 
            2
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  202. 
            2
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 836a973 (Rebased)
          
    203. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
          
  203. 
            1
=======
          
  204. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  205. 
=======
          
  206. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  207. 
            1
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
    208. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
          
  208. 
=======
<<<<<<< HEAD
          
  209. 
=======
          
  210. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
          
  211. 
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
          
  212. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
                end
>>>>>>> 7375d4b (Manifest_cache true)
          
    213. 
        
    
      
        
    
<<<<<<< HEAD
          
  213. 
<<<<<<< HEAD
=======
          
  214. 
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
          
  215. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  216. 
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
          
  217. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
=======
          
  218. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  219. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
          
  220. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
            
>>>>>>> cae047f (Manifest_cache true)
=======
            
>>>>>>> 75be480 (Manifest_cache true)
=======
              end
>>>>>>> 1a9aba9 (Fix)
          
    221. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
          
  221. 
            1
            

            

                it '#categories_names' do
          
    222. 
        
    
      
        
    
          
  222. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    223. 
        
    
      
        
    
          
  223. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    224. 
        
    
      
        
    
          
  224. 
=======
          
  225. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
            
=======
              end
>>>>>>> a5d032d (Fix)
          
    226. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  226. 
            1
=======
          
  227. 
=======
          
  228. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> 1c3ace6 (Manifest_cache true)
            

            

                it '#categories_names' do
          
    229. 
        
    
      
        
    
<<<<<<< HEAD
          
  229. 
=======
          
  230. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
    231. 
        
    
      
        
    
<<<<<<< HEAD
          
  231. 
            
            

            

                end
          
    232. 
        
    
      
        
    
          
  232. 
=======
          
  233. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
          
  234. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
          
  235. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  236. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
            
=======
          
  237. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd6db03 (Manifest_cache true)
            
=======
              end
>>>>>>> a5d032d (Fix)
=======
              end
>>>>>>> ee78f39 (Rebased)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
          
    238. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  238. 
            1
=======
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
          
  239. 
=======
          
  240. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> 0bdcc5e (Manifest_cache true)
            

            

                it '#categories_names' do
          
    241. 
        
    
      
        
    
<<<<<<< HEAD
          
  241. 
=======
          
  242. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
          
    243. 
        
    
      
        
    
<<<<<<< HEAD
          
  243. 
            
            

            

                end
          
    244. 
        
    
      
        
    
          
  244. 
=======
          
  245. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
  246. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  247. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  248. 
>>>>>>> 183b6c5 (Manifest_cache true)
            
=======
          
  249. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
    250. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  250. 
=======
          
  251. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  252. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  253. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  254. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  255. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
          
  256. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> eaef86a (Fix)
=======
=======
          
  257. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

            
          
    258. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
          
  258. 
=======
          
  259. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  260. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  261. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  262. 
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
          
  263. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  264. 
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
=======
=======
          
  265. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  266. 
>>>>>>> 998f08d (Manifest_cache true)
=======
          
  267. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
=======
          
  268. 
>>>>>>> 836a973 (Rebased)
=======
=======
          
  269. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
=======
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
          
  270. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  271. 
>>>>>>> a5d032d (Fix)
=======
=======
=======
          
  272. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  273. 
>>>>>>> 998f08d (Manifest_cache true)
=======
          
  274. 
>>>>>>> 7c4ea7f (Fix)
            1
            

            

              describe '#authors_names' do
          
    275. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
  275. 
=======
          
  276. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
  277. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
          
    278. 
        
    
      
        
    
>>>>>>> 587ce47 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  278. 
=======
          
  279. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
          
  280. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
          
  281. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  282. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
          
  283. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  284. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  285. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
                it {
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
                it {
>>>>>>> eaef86a (Fix)
=======
                it {
>>>>>>> 587ce47 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
                it {
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
    286. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 8874887 (Manifest_cache true)
          
  286. 
=======
          
  287. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
  288. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  289. 
>>>>>>> 836a973 (Rebased)
=======
=======
          
  290. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b5b269 (Fix)
              describe '#authors_names' do
          
    291. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
  291. 
=======
          
  292. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
  293. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cae047f (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
=======
                it {
>>>>>>> 836a973 (Rebased)
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
          
    294. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  294. 
=======
          
  295. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
          
  296. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> a9e654b (Manifest_cache true)
<<<<<<< HEAD
          
  297. 
>>>>>>> a5d032d (Fix)
=======
          
  298. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  299. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  300. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
=======
              describe '#authors_names' do
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
                it {
<<<<<<< HEAD
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
                it {
>>>>>>> a5d032d (Fix)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
          
    301. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d15fe1d (Fix)
          
  301. 
=======
          
  302. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  303. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  304. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  305. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> d15fe1d (Fix)
                it {
<<<<<<< HEAD
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                it {
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it {
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
                it {
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
          
    306. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
  306. 
            1
            

            

                  expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
          
    307. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
  307. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
          
  308. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
                end
=======
            
>>>>>>> 0c9131d (Manifest_cache true)
          
    309. 
        
    
      
        
    
<<<<<<< HEAD
          
  309. 
            
            

            

=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
            
=======
                end
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> ee5935f (Manifest_cache true)
          
    310. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  310. 
            1
=======
          
  311. 
            
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
          
  312. 
            1
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  313. 
            1
>>>>>>> 0c9131d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
            
=======
                end
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
              it '#categories_names' do
>>>>>>> ee5935f (Manifest_cache true)
=======
              it '#categories_names' do
>>>>>>> 0c9131d (Manifest_cache true)
          
    314. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  314. 
            1
=======
          
  315. 
            
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

            
=======
                end
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
          
    316. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  316. 
            
            

            

=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
            
=======
                end
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
          
    317. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  317. 
            1
=======
          
  318. 
            
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

            
=======
                end
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
          
    319. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  319. 
            
            

            

=======
>>>>>>> 1c3ace6 (Manifest_cache true)
            
=======
                end
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
          
    320. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  320. 
            1
=======
          
  321. 
            
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

            
          
    322. 
        
    
      
        
    
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
          
  322. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it '#categories_names' do
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
                it '#categories_names' do
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
                it '#categories_names' do
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
                it '#categories_names' do
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> ee5935f (Manifest_cache true)
=======
                it '#categories_names' do
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
                it '#categories_names' do
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
                it '#categories_names' do
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 0c9131d (Manifest_cache true)
=======
                it '#categories_names' do
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
                it '#categories_names' do
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
                it '#categories_names' do
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
          
    323. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
          
  323. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
    324. 
        
    
      
        
    
          
  324. 
            
            

            

                end
          
    325. 
        
    
      
        
    
          
  325. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  326. 
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  327. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
  328. 
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
          
  329. 
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  330. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
          
  331. 
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
          
  332. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  333. 
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  334. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
          
  335. 
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    336. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
          
  336. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
  337. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  338. 
>>>>>>> ee78f39 (Rebased)
=======
          
  339. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  340. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
  341. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
          
  342. 
>>>>>>> 836a973 (Rebased)
=======
          
  343. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> d15fe1d (Fix)
=======
=======
          
  344. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
          
  345. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
          
  346. 
>>>>>>> 1577aeb (Rebased)
=======
          
  347. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
=======
          
  348. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
          
  349. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

                                                                  "#{authors.last.first_name} #{authors.last.last_name}")
          
    350. 
        
    
      
        
    
          
  350. 
            
            

            

                }
          
    351. 
        
    
      
        
    
          
  351. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
          
  352. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  353. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  354. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
          
  355. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  356. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
          
  357. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
          
  358. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
            
            

            

              end
          
    359. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
          
  359. 
            
            

            

            
          
    360. 
        
    
      
        
    
          
  360. 
            1
            

            

              describe '#price' do
          
    361. 
        
    
      
        
    
          
  361. 
            2
            

            

                it { expect(decorated_object.price).to eq(1.23.to_money) }
          
    362. 
        
    
      
        
    
          
  362. 
            
            

            

              end
          
    363. 
        
    
      
        
    
          
  363. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
          
  364. 
>>>>>>> d0dc1f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
          
  365. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
          
  366. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
          
  367. 
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  368. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
          
  369. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
          
  370. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
          
  371. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
          
  372. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  373. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  374. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  375. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
          
  376. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
          
  377. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
          
  378. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
          
  379. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  380. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  381. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 93db8b1 (Featire specs)
=======
          
  382. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
          
  383. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  384. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
          
  385. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
          
  386. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  387. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  388. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  389. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  390. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  391. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
          
  392. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
          
  393. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

            end
          
    394.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs) =======
>>>>>>> ee78f39 (Rebased) =======
>>>>>>> 836a973 (Rebased) =======
>>>>>>> 1577aeb (Rebased)

spec/factories/addresses.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :address do
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

              end
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            end
          
    5.

spec/factories/admin_users.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :admin_user do
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            15
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
          
  4. 
            13
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
          
  5. 
            13
=======
          
  6. 
            13
>>>>>>> 2a25e4c (Featire specs)
=======
          
  7. 
            13
>>>>>>> 8c32a77 (Featire specs)
=======
          
  8. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
          
  9. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  10. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
          
  11. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  12. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
          
  13. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
          
  14. 
            15
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  15. 
            15
=======
          
  16. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
          
  17. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
          
  18. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
          
  19. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
          
  20. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  21. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
          
  22. 
            15
>>>>>>> 1d59aaa (Fix)
=======
          
  23. 
            13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  24. 
            1
>>>>>>> 078304c (Rebased)
=======
          
  25. 
            15
>>>>>>> d15fe1d (Fix)
=======
          
  26. 
            15
=======
          
  27. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
          
  28. 
            15
>>>>>>> 0b5b269 (Fix)
=======
          
  29. 
            15
=======
          
  30. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
          
  31. 
            15
>>>>>>> 1ac6be1 (Fix)
=======
          
  32. 
            13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  33. 
            1
>>>>>>> bebaea7 (Rebased)
=======
          
  34. 
            15
>>>>>>> eaef86a (Fix)
=======
          
  35. 
            15
=======
          
  36. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
          
  37. 
            15
>>>>>>> 1a9aba9 (Fix)
=======
          
  38. 
            15
=======
          
  39. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  40. 
            15
>>>>>>> 49e3b70 (Fix)
=======
          
  41. 
            15
=======
          
  42. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  43. 
            15
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                email { FFaker::Internet.email }
          
    44. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  44. 
            15
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
          
  45. 
            13
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
          
  46. 
            13
=======
          
  47. 
            13
>>>>>>> 2a25e4c (Featire specs)
=======
          
  48. 
            13
>>>>>>> 8c32a77 (Featire specs)
=======
          
  49. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
          
  50. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  51. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
          
  52. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  53. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
          
  54. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
          
  55. 
            15
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  56. 
            15
=======
          
  57. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
          
  58. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
          
  59. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
          
  60. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
          
  61. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  62. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
          
  63. 
            15
>>>>>>> 1d59aaa (Fix)
=======
          
  64. 
            13
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  65. 
            1
>>>>>>> 078304c (Rebased)
=======
          
  66. 
            15
>>>>>>> d15fe1d (Fix)
=======
          
  67. 
            15
=======
          
  68. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
          
  69. 
            15
>>>>>>> 0b5b269 (Fix)
=======
          
  70. 
            15
=======
          
  71. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
          
  72. 
            15
>>>>>>> 1ac6be1 (Fix)
=======
          
  73. 
            13
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  74. 
            1
>>>>>>> bebaea7 (Rebased)
=======
          
  75. 
            15
>>>>>>> eaef86a (Fix)
=======
          
  76. 
            15
=======
          
  77. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
          
  78. 
            15
>>>>>>> 1a9aba9 (Fix)
=======
          
  79. 
            15
=======
          
  80. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  81. 
            15
>>>>>>> 49e3b70 (Fix)
=======
          
  82. 
            15
=======
          
  83. 
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  84. 
            15
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                password { 'adminPassword' }
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

              end
          
    86. 
        
    
      
        
    
          
  86. 
=======
          
  87. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

            end
          
    88.

spec/factories/authors.rb

<<<<<<< HEAD 80.0% ======= 100.0% >>>>>>> cde4834 (Manifest_cache true) lines covered

<<<<<<< HEAD 10 relevant lines. 8 lines covered and 2 lines missed. ======= 4 relevant lines. 4 lines covered and 0 lines missed. >>>>>>> cde4834 (Manifest_cache true) 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :author do
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
          
  3. 
            5
=======
          
  4. 
            1
>>>>>>> cde4834 (Manifest_cache true)
            

            

                first_name { FFaker::Name.first_name }
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
          
  5. 
            5
=======
          
  6. 
            1
>>>>>>> cde4834 (Manifest_cache true)
            

            

                last_name { FFaker::Name.last_name }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

<<<<<<< HEAD
            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                transient do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  books_count { 1 }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                after :create do |author, books_count|
          
    13. 
        
    
      
        
    
          
  13. 
            10
            

            

                  author.books do
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    Array.new(books_count) do
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                      association(:author, books: [instance])
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
              end
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
          
  20. 
=======
          
  21. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

            end
          
    22.

spec/factories/authors.rb

80.0% lines covered

10 relevant lines. 8 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :author do
          
    3. 
        
    
      
        
    
          
  3. 
            5
            

            

                first_name { FFaker::Name.first_name }
          
    4. 
        
    
      
        
    
          
  4. 
            5
            

            

                last_name { FFaker::Name.last_name }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                transient do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  books_count { 1 }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                after :create do |author, books_count|
          
    11. 
        
    
      
        
    
          
  11. 
            10
            

            

                  author.books do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                    Array.new(books_count) do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                      association(:author, books: [instance])
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            end
          
    19.

spec/factories/authors_books.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :authors_book do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                author
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                book
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

              end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)

spec/factories/billings.rb

=======

spec/factories/books.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======

spec/factories/billings.rb

>>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======

spec/factories/books.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======

spec/factories/books.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======

spec/factories/billings.rb

>>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/books.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 8 relevant lines. 8 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :billing do
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
              factory :billing do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.

spec/factories/books.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :book do
>>>>>>> 1577aeb (Rebased)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
          
  3. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  4. 
            3
=======
<<<<<<< HEAD
          
  5. 
            82
=======
          
  6. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  7. 
            105
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  8. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  9. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  10. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
  11. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  12. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  13. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  14. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  15. 
            95
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  16. 
            95
=======
          
  17. 
            105
>>>>>>> c1749d5 (Featire specs)
=======
          
  18. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  19. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  20. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  21. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  22. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  23. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  24. 
            97
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  25. 
            97
=======
          
  26. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  27. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  28. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  29. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  30. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  31. 
            80
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  32. 
            105
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  33. 
            105
=======
          
  34. 
            105
>>>>>>> 65f3409 (Featire specs)
=======
          
  35. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  36. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  37. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  38. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  39. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  40. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  41. 
            105
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  42. 
            80
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  43. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  44. 
            105
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                user
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
          
  45. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  46. 
            3
=======
<<<<<<< HEAD
          
  47. 
            92
=======
          
  48. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  49. 
            119
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  50. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  51. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  52. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
  53. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  54. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  55. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  56. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  57. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  58. 
            109
=======
          
  59. 
            119
>>>>>>> c1749d5 (Featire specs)
=======
          
  60. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  61. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  62. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  63. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  64. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  65. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  66. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  67. 
            111
=======
          
  68. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  69. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  70. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  71. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  72. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  73. 
            90
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  74. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  75. 
            119
=======
          
  76. 
            119
>>>>>>> 65f3409 (Featire specs)
=======
          
  77. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  78. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  79. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  80. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  81. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  82. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  83. 
            119
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  84. 
            90
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  85. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  86. 
            119
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                address { FFaker::AddressUA.street_address }
          
    87. 
        
    
      
        
    
<<<<<<< HEAD
          
  87. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  88. 
            3
=======
<<<<<<< HEAD
          
  89. 
            82
=======
          
  90. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  91. 
            98
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  92. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  93. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  94. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
  95. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  96. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  97. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  98. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  99. 
            92
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  100. 
            92
=======
          
  101. 
            98
>>>>>>> c1749d5 (Featire specs)
=======
          
  102. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  103. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  104. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  105. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  106. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  107. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  108. 
            94
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  109. 
            94
=======
          
  110. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  111. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  112. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  113. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  114. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  115. 
            80
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  116. 
            98
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  117. 
            98
=======
          
  118. 
            98
>>>>>>> 65f3409 (Featire specs)
=======
          
  119. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  120. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  121. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  122. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  123. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  124. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  125. 
            98
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  126. 
            80
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  127. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  128. 
            98
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                city { FFaker::AddressUA.city }
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> bebaea7 (Rebased)
=======
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 1a9aba9 (Fix)
=======
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 49e3b70 (Fix)
=======
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    129. 
        
    
      
        
    
<<<<<<< HEAD
          
  129. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  130. 
            3
=======
<<<<<<< HEAD
          
  131. 
            92
=======
          
  132. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  133. 
            119
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  134. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  135. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  136. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
  137. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  138. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  139. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  140. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  141. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  142. 
            109
=======
          
  143. 
            119
>>>>>>> c1749d5 (Featire specs)
=======
          
  144. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  145. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  146. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  147. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  148. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  149. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  150. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  151. 
            111
=======
          
  152. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  153. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  154. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  155. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  156. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  157. 
            90
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  158. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  159. 
            119
=======
          
  160. 
            119
>>>>>>> 65f3409 (Featire specs)
=======
          
  161. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  162. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  163. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  164. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  165. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  166. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  167. 
            119
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  168. 
            90
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  169. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  170. 
            119
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                zip { FFaker::AddressUA.zip_code }
          
    171. 
        
    
      
        
    
<<<<<<< HEAD
          
  171. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  172. 
            3
=======
<<<<<<< HEAD
          
  173. 
            92
=======
          
  174. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  175. 
            119
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  176. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  177. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  178. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
  179. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  180. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  181. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  182. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  183. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  184. 
            109
=======
          
  185. 
            119
>>>>>>> c1749d5 (Featire specs)
=======
          
  186. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  187. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  188. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  189. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  190. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  191. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  192. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  193. 
            111
=======
          
  194. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  195. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  196. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  197. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  198. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  199. 
            90
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  200. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  201. 
            119
=======
          
  202. 
            119
>>>>>>> 65f3409 (Featire specs)
=======
          
  203. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  204. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  205. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  206. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  207. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  208. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  209. 
            119
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  210. 
            90
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  211. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  212. 
            119
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                country { FFaker::AddressUA.country }
          
    213. 
        
    
      
        
    
<<<<<<< HEAD
          
  213. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  214. 
            3
=======
<<<<<<< HEAD
          
  215. 
            92
=======
          
  216. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  217. 
            119
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  218. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  219. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  220. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
  221. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  222. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  223. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  224. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  225. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  226. 
            109
=======
          
  227. 
            119
>>>>>>> c1749d5 (Featire specs)
=======
          
  228. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  229. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  230. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  231. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  232. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  233. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  234. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  235. 
            111
=======
          
  236. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  237. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
=======
          
  238. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
=======
          
  239. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
=======
          
  240. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  241. 
            90
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  242. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  243. 
            119
=======
          
  244. 
            119
>>>>>>> 65f3409 (Featire specs)
=======
          
  245. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  246. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  247. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  248. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  249. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  250. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  251. 
            119
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  252. 
            90
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  253. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  254. 
            119
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    255. 
        
    
      
        
    
<<<<<<< HEAD
          
  255. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  256. 
            3
=======
<<<<<<< HEAD
          
  257. 
            92
=======
          
  258. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  259. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
  260. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  261. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  262. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  263. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
          
  264. 
            119
=======
          
  265. 
            90
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  266. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c1749d5 (Featire specs)
=======
=======
          
  267. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  268. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8577deb (Featire specs)
=======
=======
          
  269. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ebe5361 (Featire specs)
=======
=======
          
  270. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
          
  271. 
            119
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
  272. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  273. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  274. 
            109
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
          
  275. 
            109
=======
          
  276. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  277. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  278. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  279. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  280. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  281. 
            1
>>>>>>> bf554f4 (Rebased)
=======
          
  282. 
            111
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  283. 
            111
=======
          
  284. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  285. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
          
  286. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  287. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  288. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  289. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
          
  290. 
            119
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  291. 
            119
=======
          
  292. 
            119
>>>>>>> 65f3409 (Featire specs)
=======
          
  293. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
=======
=======
          
  294. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
=======
=======
          
  295. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
=======
=======
          
  296. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
=======
=======
          
  297. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
          
  298. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  299. 
            119
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                quantity { FFaker::Number.rand(0..10) }
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 7c4ea7f (Fix)
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 8f1bc14 (Fix)
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
    300. 
        
    
      
        
    
          
  300. 
>>>>>>> 3dc272d (Featire specs)
            
            

            

            
          
    301. 
        
    
      
        
    
          
  301. 
            1
            

            

                transient do
          
    302. 
        
    
      
        
    
          
  302. 
            1
            

            

                  categories_count { 1 }
          
    303. 
        
    
      
        
    
          
  303. 
            
            

            

                end
          
    304. 
        
    
      
        
    
          
  304. 
            
            

            

            
          
    305. 
        
    
      
        
    
          
  305. 
            1
            

            

                transient do
          
    306. 
        
    
      
        
    
          
  306. 
            1
            

            

                  authors_count { 1 }
          
    307. 
        
    
      
        
    
          
  307. 
            
            

            

                end
          
    308. 
        
    
      
        
    
          
  308. 
            
            

            

            
          
    309. 
        
    
      
        
    
          
  309. 
            1
            

            

                after :create do |book, authors_count|
          
    310. 
        
    
      
        
    
          
  310. 
            118
            

            

                  book.authors do
          
    311. 
        
    
      
        
    
          
  311. 
            
            

            

                    Array.new(authors_count) do
          
    312. 
        
    
      
        
    
          
  312. 
            
            

            

                      association(:book, authors: [instance])
          
    313. 
        
    
      
        
    
          
  313. 
            
            

            

                    end
          
    314. 
        
    
      
        
    
          
  314. 
            
            

            

                  end
          
    315. 
        
    
      
        
    
          
  315. 
            
            

            

                end
          
    316. 
        
    
      
        
    
          
  316. 
            
            

            

            
          
    317. 
        
    
      
        
    
          
  317. 
            1
            

            

                after :create do |book, categories_count|
          
    318. 
        
    
      
        
    
          
  318. 
            118
            

            

                  book.categories do
          
    319. 
        
    
      
        
    
          
  319. 
            
            

            

                    Array.new(categories_count) do
          
    320. 
        
    
      
        
    
          
  320. 
            
            

            

                      association(:book, categories: [instance])
          
    321. 
        
    
      
        
    
          
  321. 
            
            

            

                    end
          
    322. 
        
    
      
        
    
          
  322. 
            
            

            

                  end
          
    323. 
        
    
      
        
    
          
  323. 
            
            

            

                end
          
    324. 
        
    
      
        
    
          
  324. 
            
            

            

              end
          
    325. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  325. 
=======
          
  326. 
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  327. 
=======
          
  328. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  329. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  330. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  331. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
          
  332. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
          
  333. 
>>>>>>> bebaea7 (Rebased)
=======
          
  334. 
=======
          
  335. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
          
  336. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  337. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  338. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
          
  339. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  340. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
          
  341. 
>>>>>>> 1a9aba9 (Fix)
=======
          
  342. 
=======
          
  343. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
          
  344. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
          
  345. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
          
  346. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
          
  347. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  348. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
          
  349. 
>>>>>>> 49e3b70 (Fix)
=======
          
  350. 
=======
          
  351. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  352. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  353. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  354. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
          
  355. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  356. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  357. 
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

            end
          
    358.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

spec/factories/books.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
              factory :book do
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            95
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  4. 
            3
=======
<<<<<<< HEAD
          
  5. 
            82
=======
          
  6. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  7. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
          
  8. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  9. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  10. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  11. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  12. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  13. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  14. 
            95
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  15. 
            95
=======
          
  16. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  17. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  18. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  19. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  20. 
            80
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  21. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  22. 
            97
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  23. 
            97
=======
          
  24. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  25. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  26. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  27. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  28. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  29. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  30. 
            105
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  31. 
            105
=======
          
  32. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  33. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  34. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  35. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  36. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  37. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  38. 
            105
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  39. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

                title { FFaker::Book.title }
          
    40. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  40. 
            109
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  41. 
            3
=======
<<<<<<< HEAD
          
  42. 
            92
=======
          
  43. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  44. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
  45. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  46. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  47. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  48. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  49. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  50. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  51. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  52. 
            109
=======
          
  53. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  54. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  55. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  56. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  57. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  58. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  59. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  60. 
            111
=======
          
  61. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  62. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  63. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  64. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  65. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  66. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  67. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  68. 
            119
=======
          
  69. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  70. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  71. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  72. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  73. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  74. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  75. 
            119
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  76. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

                description { FFaker::Book.description }
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
            92
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  78. 
            3
=======
<<<<<<< HEAD
          
  79. 
            82
=======
          
  80. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  81. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
          
  82. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  83. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  84. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  85. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  86. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  87. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  88. 
            92
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  89. 
            92
=======
          
  90. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  91. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  92. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  93. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  94. 
            80
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  95. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  96. 
            94
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  97. 
            94
=======
          
  98. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  99. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  100. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  101. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  102. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  103. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  104. 
            98
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  105. 
            98
=======
          
  106. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  107. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  108. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  109. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  110. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  111. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  112. 
            98
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  113. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> cde4834 (Manifest_cache true)
          
    114. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  114. 
            109
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  115. 
            3
=======
<<<<<<< HEAD
          
  116. 
            92
=======
          
  117. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  118. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
  119. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  120. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  121. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  122. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  123. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  124. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  125. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  126. 
            109
=======
          
  127. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  128. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  129. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  130. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  131. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  132. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  133. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  134. 
            111
=======
          
  135. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  136. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  137. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  138. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  139. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  140. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  141. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  142. 
            119
=======
          
  143. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  144. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  145. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  146. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  147. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  148. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  149. 
            119
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  150. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

                materials { FFaker::Book.cover(:format) }
          
    151. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  151. 
            109
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  152. 
            3
=======
<<<<<<< HEAD
          
  153. 
            92
=======
          
  154. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  155. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
  156. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  157. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  158. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  159. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  160. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  161. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  162. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  163. 
            109
=======
          
  164. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  165. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  166. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  167. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  168. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  169. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  170. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  171. 
            111
=======
          
  172. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  173. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  174. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  175. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  176. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  177. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  178. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  179. 
            119
=======
          
  180. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  181. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  182. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  183. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  184. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  185. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  186. 
            119
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  187. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

                year_of_publication { FFaker::Number.rand(1900..2022) }
          
    188. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  188. 
            109
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  189. 
            3
=======
<<<<<<< HEAD
          
  190. 
            92
=======
          
  191. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  192. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
  193. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  194. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  195. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  196. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  197. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  198. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  199. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  200. 
            109
=======
          
  201. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  202. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  203. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  204. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  205. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  206. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  207. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  208. 
            111
=======
          
  209. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  210. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  211. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  212. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  213. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  214. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  215. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  216. 
            119
=======
          
  217. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  218. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  219. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  220. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  221. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  222. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  223. 
            119
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  224. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

                dimensions { FFaker::Book.cover(:size) }
          
    225. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  225. 
            109
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
          
  226. 
            3
=======
<<<<<<< HEAD
          
  227. 
            92
=======
          
  228. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  229. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
  230. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  231. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  232. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  233. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
          
  234. 
            3
>>>>>>> cde4834 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                quantity { FFaker::Number.rand(2..10) }
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
          
  235. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  236. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  237. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
  238. 
            109
=======
          
  239. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  240. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  241. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  242. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  243. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
          
  244. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d15fe1d (Fix)
=======
          
  245. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
          
  246. 
            111
=======
          
  247. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  248. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  249. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  250. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  251. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  252. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  253. 
            119
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
          
  254. 
            119
=======
          
  255. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  256. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  257. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  258. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  259. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  260. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  261. 
            119
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
                quantity { FFaker::Number.rand(0..10) }
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> cde4834 (Manifest_cache true)
          
    262. 
        
    
      
        
    
          
  262. 
            
            

            

<<<<<<< HEAD
            
          
    263. 
        
    
      
        
    
          
  263. 
            1
            

            

                transient do
          
    264. 
        
    
      
        
    
          
  264. 
            1
            

            

                  categories_count { 1 }
          
    265. 
        
    
      
        
    
          
  265. 
            
            

            

                end
          
    266. 
        
    
      
        
    
          
  266. 
            
            

            

            
          
    267. 
        
    
      
        
    
          
  267. 
            1
            

            

                transient do
          
    268. 
        
    
      
        
    
          
  268. 
            1
            

            

                  authors_count { 1 }
          
    269. 
        
    
      
        
    
          
  269. 
            
            

            

                end
          
    270. 
        
    
      
        
    
          
  270. 
            
            

            

            
          
    271. 
        
    
      
        
    
          
  271. 
            1
            

            

                after :create do |book, authors_count|
          
    272. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  272. 
            110
=======
          
  273. 
            108
>>>>>>> ee78f39 (Rebased)
=======
          
  274. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  275. 
            110
>>>>>>> 872e675 (Fix)
=======
          
  276. 
            118
>>>>>>> 1d59aaa (Fix)
=======
          
  277. 
            108
>>>>>>> 836a973 (Rebased)
=======
          
  278. 
            
>>>>>>> 078304c (Rebased)
=======
          
  279. 
            110
>>>>>>> d15fe1d (Fix)
=======
          
  280. 
            118
>>>>>>> 0b5b269 (Fix)
            

            

                  book.authors do
          
    281. 
        
    
      
        
    
          
  281. 
            
            

            

                    Array.new(authors_count) do
          
    282. 
        
    
      
        
    
          
  282. 
            
            

            

                      association(:book, authors: [instance])
          
    283. 
        
    
      
        
    
          
  283. 
            
            

            

                    end
          
    284. 
        
    
      
        
    
          
  284. 
            
            

            

                  end
          
    285. 
        
    
      
        
    
          
  285. 
            
            

            

                end
          
    286. 
        
    
      
        
    
          
  286. 
            
            

            

            
          
    287. 
        
    
      
        
    
          
  287. 
            1
            

            

                after :create do |book, categories_count|
          
    288. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  288. 
            110
=======
          
  289. 
            108
>>>>>>> ee78f39 (Rebased)
=======
          
  290. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  291. 
            110
>>>>>>> 872e675 (Fix)
=======
          
  292. 
            118
>>>>>>> 1d59aaa (Fix)
=======
          
  293. 
            108
>>>>>>> 836a973 (Rebased)
=======
          
  294. 
            
>>>>>>> 078304c (Rebased)
=======
          
  295. 
            110
>>>>>>> d15fe1d (Fix)
=======
          
  296. 
            118
>>>>>>> 0b5b269 (Fix)
            

            

                  book.categories do
          
    297. 
        
    
      
        
    
          
  297. 
            
            

            

                    Array.new(categories_count) do
          
    298. 
        
    
      
        
    
          
  298. 
            
            

            

                      association(:book, categories: [instance])
          
    299. 
        
    
      
        
    
          
  299. 
            
            

            

                    end
          
    300. 
        
    
      
        
    
          
  300. 
            
            

            

                  end
          
    301. 
        
    
      
        
    
          
  301. 
            
            

            

                end
          
    302. 
        
    
      
        
    
          
  302. 
            
            

            

=======
>>>>>>> cde4834 (Manifest_cache true)
              end
          
    303. 
        
    
      
        
    
<<<<<<< HEAD
          
  303. 
=======
          
  304. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

            end
          
    305.
<<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)

spec/factories/books_categories.rb

=======

spec/factories/books_category.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======

spec/factories/books_categories.rb

>>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :books_category do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                book
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                category
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

              end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            end
          
    7.

spec/factories/categories.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :category do
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            12
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  4. 
            12
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
<<<<<<< HEAD
=======
          
  5. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  6. 
            12
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  7. 
            1
=======
<<<<<<< HEAD
          
  8. 
            8
=======
          
  9. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  10. 
            8
>>>>>>> 752f0c0 (Featire specs)
=======
          
  11. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  12. 
            8
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  13. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  14. 
            8
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  15. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
          
  16. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  17. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
  18. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  19. 
            8
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  20. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
          
  21. 
            12
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
          
  22. 
            12
>>>>>>> 9620751 (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
          
  23. 
            12
>>>>>>> 2a25e4c (Featire specs)
=======
          
  24. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  25. 
            12
>>>>>>> 9dc109d (Featire specs)
=======
=======
          
  26. 
            12
>>>>>>> 8c32a77 (Featire specs)
=======
          
  27. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
  28. 
            12
>>>>>>> 9dc109d (Featire specs)
=======
          
  29. 
            12
>>>>>>> 65f3409 (Featire specs)
=======
          
  30. 
            8
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
  31. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  32. 
            8
=======
          
  33. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  34. 
            8
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  35. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  36. 
            8
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  37. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  38. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  39. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  40. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  41. 
            8
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  42. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
          
  43. 
            8
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  44. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
          
  45. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
>>>>>>> b8aab1a (Manifest_cache true)
=======
          
  46. 
            8
=======
          
  47. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  48. 
            8
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  49. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  50. 
            8
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  51. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  52. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  53. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  54. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  55. 
            8
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  56. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  57. 
            8
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  58. 
            12
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  59. 
            12
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
          
  60. 
            1
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
          
  61. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 4e7b845 (Manifest_cache true)
=======
          
  62. 
            8
=======
          
  63. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  64. 
            8
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
          
  65. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  66. 
            8
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  67. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  68. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  69. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  70. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  71. 
            8
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  72. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  73. 
            8
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  74. 
            12
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
          
  75. 
            12
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  76. 
            12
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                name { FFaker::Book.genre }
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

              end
          
    78. 
        
    
      
        
    
          
  78. 
            
            

            

            end
          
    79.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased)
======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix)
>>>>>>> 7c4ea7f (Fix) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 7c4ea7f (Fix)

spec/factories/coupons.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :coupon do
          
    3. 
        
    
      
        
    
          
  3. 
            4
            

            

                code { SecureRandom.hex }
          
    4. 
        
    
      
        
    
          
  4. 
            4
            

            

                is_active { true }
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                active_till_date { FFaker::Time.datetime }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                discount { rand(0.0..1.0) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

spec/factories/credit_cards.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :credit_card do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user { user }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                code { FFaker::Finance.credit_card }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                name { FFaker::Lorem.word }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                cvv { rand(0...10).to_s * 3 }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                expiration_date { (Time.zone.now + rand(1..10).year * rand(0..1)).strftime('%m/%y') }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

spec/factories/deliveries.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :delivery do
          
    3. 
        
    
      
        
    
          
  3. 
            5
            

            

                price_cents { rand(0...10_000) }
          
    4. 
        
    
      
        
    
          
  4. 
            5
            

            

                delivery_method { FFaker::Lorem.word }
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                delivery_day { rand(1..5) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/order_books.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :order_book do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                order
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                book
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                quantity { 1 }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/orders.rb

80.0% lines covered

10 relevant lines. 8 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :order do
          
    3. 
        
    
      
        
    
          
  3. 
            5
            

            

                status { 'initialized' }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                delivery
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                transient do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  books_count { 1 }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                after :create do |order, books_count|
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  order.books do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                    Array.new(books_count) do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                      association(:order, books: [instance])
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                  end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            end
          
    19.

spec/factories/reviews.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :review do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                title { FFaker::Lorem.words(5) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :shipping do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.
>>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :user do
          
    3. 
        
    
      
        
    
          
  3. 
            20
            

            

                email { FFaker::Internet.email }
          
    4. 
        
    
      
        
    
          
  4. 
            27
            

            

                password { 'password' }
          
    5. 
        
    
      
        
    
          
  5. 
            27
            

            

                confirmed_at { Time.zone.now }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> 3dc272d (Featire specs)

spec/factories/coupons.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> 1577aeb (Rebased)

100.0% lines covered

<<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 1577aeb (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
=======
            RSpec.describe 'Author' do
>>>>>>> 1577aeb (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            1
<<<<<<< HEAD
            

            

              factory :coupon do
          
    3. 
        
    
      
        
    
          
  3. 
            4
            

            

                code { SecureRandom.hex }
          
    4. 
        
    
      
        
    
          
  4. 
            4
            

            

                is_active { true }
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                active_till_date { FFaker::Time.datetime }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                discount { rand(0.0..5.0) }
          
    7. 
        
    
      
        
    
          
  7. 
            
=======
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

spec/factories/order_books.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :order_book do
=======
              include_context 'with api request authentication helper methods'
>>>>>>> 1577aeb (Rebased)
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
                order
=======
              include_context 'with api request global before and after hooks'
>>>>>>> 1577aeb (Rebased)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
=======
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

              let(:old_name) { author.first_name }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

              let(:author) { create(:author) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
                book
=======
              before do
          
    15. 
        
    
      
        
    
          
  15. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              it 'can create an author' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                visit 'admin/authors'
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                click_link('New Author')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              it 'can delete an author' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                author
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                visit 'admin/authors'
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

              it 'can view an author' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                author
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                visit 'admin/authors'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                click_link('View')
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              it 'can edit an author' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                author
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                visit 'admin/authors'
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                click_link('Edit')
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            end
          
    59.

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
>>>>>>> 1577aeb (Rebased)
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

<<<<<<< HEAD
                quantity { 1 }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/orders.rb

77.78% lines covered

9 relevant lines. 7 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :order do
          
    3. 
        
    
      
        
    
          
  3. 
            5
            

            

                status { 'created' }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                transient do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                  books_count { 1 }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                after :create do |order, books_count|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  order.books do
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                    Array.new(books_count) do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                      association(:order, books: [instance])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                    end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                  end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

spec/factories/reviews.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :review do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                title { FFaker::Lorem.words(5) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :shipping do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :user do
          
    3. 
        
    
      
        
    
          
  3. 
            20
            

            

                email { FFaker::Internet.email }
          
    4. 
        
    
      
        
    
          
  4. 
            27
            

            

                password { 'password' }
          
    5. 
        
    
      
        
    
          
  5. 
            27
            

            

                confirmed_at { Time.zone.now }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> 715fac2 (Featire specs)

spec/factories/coupons.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> 836a973 (Rebased)

100.0% lines covered

<<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 836a973 (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
=======
            RSpec.describe 'Author' do
>>>>>>> 836a973 (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            1
<<<<<<< HEAD
            

            

              factory :coupon do
          
    3. 
        
    
      
        
    
          
  3. 
            4
            

            

                code { SecureRandom.hex }
          
    4. 
        
    
      
        
    
          
  4. 
            4
            

            

                is_active { true }
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                active_till_date { FFaker::Time.datetime }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                discount { rand(0..50) / 100 }
          
    7. 
        
    
      
        
    
          
  7. 
            
=======
>>>>>>> 836a973 (Rebased)
            

            

<<<<<<< HEAD
              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

spec/factories/order_books.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :order_book do
=======
              include_context 'with api request authentication helper methods'
>>>>>>> 836a973 (Rebased)
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
                order
=======
              include_context 'with api request global before and after hooks'
>>>>>>> 836a973 (Rebased)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
=======
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

              let(:old_name) { author.first_name }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

              let(:author) { create(:author) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 836a973 (Rebased)
            1
            

            

<<<<<<< HEAD
                book
=======
              before do
          
    15. 
        
    
      
        
    
          
  15. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              it 'can create an author' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                visit 'admin/authors'
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                click_link('New Author')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              it 'can delete an author' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                author
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                visit 'admin/authors'
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

              it 'can view an author' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                author
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                visit 'admin/authors'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                click_link('View')
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              it 'can edit an author' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                author
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                visit 'admin/authors'
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                click_link('Edit')
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            end
          
    59.

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
>>>>>>> 836a973 (Rebased)
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

<<<<<<< HEAD
                quantity { 1 }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/orders.rb

77.78% lines covered

9 relevant lines. 7 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :order do
          
    3. 
        
    
      
        
    
          
  3. 
            5
            

            

                status { 'created' }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                transient do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                  books_count { 1 }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                after :create do |order, books_count|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  order.books do
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                    Array.new(books_count) do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                      association(:order, books: [instance])
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                    end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                  end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

spec/factories/reviews.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :review do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                title { FFaker::Lorem.words(5) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :shipping do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :user do
          
    3. 
        
    
      
        
    
          
  3. 
            17
            

            

                email { FFaker::Internet.email }
          
    4. 
        
    
      
        
    
          
  4. 
            24
            

            

                password { 'password' }
          
    5. 
        
    
      
        
    
          
  5. 
            24
            

            

                confirmed_at { Time.zone.now }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> df37394 (Featire specs)

spec/factories/reviews.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> ee78f39 (Rebased)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> ee78f39 (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
=======
            RSpec.describe 'Author' do
>>>>>>> ee78f39 (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
              factory :review do
=======
              include_context 'with api request authentication helper methods'
>>>>>>> ee78f39 (Rebased)
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
                title { FFaker::Lorem.words(5) }
=======
              include_context 'with api request global before and after hooks'
>>>>>>> ee78f39 (Rebased)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
            1
=======
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

              let(:old_name) { author.first_name }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

              let(:author) { create(:author) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              before do
          
    15. 
        
    
      
        
    
          
  15. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              it 'can create an author' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                visit 'admin/authors'
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                click_link('New Author')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              it 'can delete an author' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                author
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                visit 'admin/authors'
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

              it 'can view an author' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                author
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                visit 'admin/authors'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                click_link('View')
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              it 'can edit an author' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                author
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                visit 'admin/authors'
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                click_link('Edit')
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            end
          
    59.

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
=======
          
  6. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  7. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  8. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  9. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  10. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  11. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  12. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  14. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  15. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  16. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  17. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  18. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            5
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            end
          
    22.

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :shipping do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.
>>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :user do
          
    3. 
        
    
      
        
    
          
  3. 
            13
            

            

                email { FFaker::Internet.email }
          
    4. 
        
    
      
        
    
          
  4. 
            20
            

            

                password { 'password' }
          
    5. 
        
    
      
        
    
          
  5. 
            20
            

            

                confirmed_at { Time.zone.now }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> d96cf3b (Featire specs)

spec/factories/reviews.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> d780a52 (Rebased)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> d780a52 (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
=======
            RSpec.describe 'Author' do
>>>>>>> d780a52 (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
              factory :review do
=======
              include_context 'with api request authentication helper methods'
>>>>>>> d780a52 (Rebased)
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
                title { FFaker::Lorem.words(5) }
=======
              include_context 'with api request global before and after hooks'
>>>>>>> d780a52 (Rebased)
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
          
  4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :shipping do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                user
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.
>>>>>>> aca90e3 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            FactoryBot.define do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              factory :user do
          
    3. 
        
    
      
        
    
          
  3. 
            13
            

            

                email { FFaker::Internet.email }
          
    4. 
        
    
      
        
    
          
  4. 
            20
            

            

                password { 'password' }
          
    5. 
        
    
      
        
    
          
  5. 
            20
            

            

                confirmed_at { Time.zone.now }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
<<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> aca90e3 (Rebased)

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

100.0% lines covered

31 relevant lines. 31 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Author' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
=======
>>>>>>> d780a52 (Rebased)
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

              let(:old_name) { author.first_name }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

              let(:author) { create(:author) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              before do
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              it 'can create an author' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                visit 'admin/authors'
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                click_link('New Author')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

              it 'can delete an author' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                author
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                visit 'admin/authors'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

              it 'can view an author' do
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                author
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                visit 'admin/authors'
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                click_link('View')
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

              end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              it 'can edit an author' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                author
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                visit 'admin/authors'
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                click_link('Edit')
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

              end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            end
          
    58.

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            7
            

            

=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
              let(:book) { create(:book) }
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
              let(:book) { create(:book) }
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
              let(:category_one) { FactoryBot.create(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
              let(:book) { create(:book) }
>>>>>>> 836a973 (Rebased)
=======
              let(:book) { create(:book) }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              let(:params) do
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  8. 
            1
=======
          
  9. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56ef3ac (Featire specs)
=======
          
  10. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  11. 
            4
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
=======
          
  12. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  13. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  14. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  15. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  16. 
            1
>>>>>>> 836a973 (Rebased)
=======
          
  17. 
            1
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            

            

                { title: FFaker::Book.title,
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  description: FFaker::Book.description,
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 836a973 (Rebased)
=======
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                  materials: 'Soft cover',
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              before do
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
            6
=======
          
  28. 
            4
>>>>>>> ee78f39 (Rebased)
=======
          
  29. 
            4
>>>>>>> 836a973 (Rebased)
=======
          
  30. 
            4
>>>>>>> 1577aeb (Rebased)
            

            

                sign_in(create(:admin_user), :admin_user)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  32. 
            6
=======
          
  33. 
            4
>>>>>>> ee78f39 (Rebased)
=======
          
  34. 
            4
>>>>>>> 836a973 (Rebased)
=======
          
  35. 
            4
>>>>>>> 1577aeb (Rebased)
            

            

                book
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
            6
=======
          
  38. 
            4
>>>>>>> ee78f39 (Rebased)
=======
          
  39. 
            4
>>>>>>> 836a973 (Rebased)
=======
          
  40. 
            4
>>>>>>> 1577aeb (Rebased)
            

            

                visit 'admin/books'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

              it 'can create an category' do
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                click_link('New Book')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                click_button('Create Book')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                expect(page).to have_content(params[:title])
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

              it 'can delete an book' do
          
    60. 
        
    
      
        
    
          
  60. 
            1
            

            

                click_link('Delete')
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

              end
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

              it 'can view an book' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                click_link('View')
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

            
          
    68. 
        
    
      
        
    
          
  68. 
            1
            

            

                expect(page).to have_content(book.title)
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

              end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

              it 'can edit an book' do
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                click_link('Edit')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

            
          
    76. 
        
    
      
        
    
          
  76. 
            1
            

            

                click_button('Update Book')
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                expect(page).to have_content('New title')
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

              end
          
    80. 
        
    
      
        
    
          
  80. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
          
    81. 
        
    
      
        
    
          
  81. 
            1
            

            

              context 'when image' do
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                before do
          
    83. 
        
    
      
        
    
          
  83. 
            2
            

            

                  click_link('Edit')
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

            
          
    85. 
        
    
      
        
    
          
  85. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

            
          
    87. 
        
    
      
        
    
          
  87. 
            2
            

            

                  click_on 'Update Book'
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

                end
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                it 'can add images to book' do
          
    91. 
        
    
      
        
    
          
  91. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

                end
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

            
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

                it 'can delete images from book' do
          
    95. 
        
    
      
        
    
          
  95. 
            1
            

            

                  click_link('Edit')
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            
          
    97. 
        
    
      
        
    
          
  97. 
            1
            

            

                  click_link('Delete')
          
    98. 
        
    
      
        
    
          
  98. 
            
            

            

            
          
    99. 
        
    
      
        
    
          
  99. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

                end
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

              end
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

=======
>>>>>>> ee78f39 (Rebased)
            end
          
    103.

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Category' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:category) { create(:category) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              before do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                category
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                visit 'admin/categories'
          
    15. 
        
    
      
        
    
          
  15. 
            
=======
          
  16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  17. 
            7
>>>>>>> 752f0c0 (Featire specs)
=======
          
  18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  19. 
            7
>>>>>>> 08edf50 (Featire specs)
=======
          
  20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  21. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  27. 
            1
            

            

                  visit "books/#{book.id}"
          
    28. 
        
    
      
        
    
          
  28. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
=======
          
  30. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  31. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  32. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  33. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  34. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  35. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  36. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                click_button('Create Category')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            
=======
          
  49. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  50. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  51. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  52. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  53. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  54. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  55. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  58. 
            1
            

            

                click_link('Delete')
          
    59. 
        
    
      
        
    
          
  59. 
=======
          
  60. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  61. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  62. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  63. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  64. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  66. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
=======
          
  68. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  69. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  70. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  71. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  72. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  73. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  74. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
=======
>>>>>>> 836a973 (Rebased)
          
    75. 
        
    
      
        
    
          
  75. 
            1
            

            

<<<<<<< HEAD
                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                fill_in 'book[price_cents]', with: params[:price_cents]
>>>>>>> 836a973 (Rebased)
          
    76. 
        
    
      
        
    
          
  76. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                fill_in 'book[materials]', with: params[:materials]
>>>>>>> 836a973 (Rebased)
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
            
=======
          
  78. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  79. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  80. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  81. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  82. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  83. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  84. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                fill_in 'book[dimensions]', with: params[:dimensions]
>>>>>>> 836a973 (Rebased)
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                fill_in 'book[quantity]', with: params[:quantity]
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

            
          
    87. 
        
    
      
        
    
          
  87. 
            1
            

            

                click_button('Create Book')
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

            
          
    89. 
        
    
      
        
    
          
  89. 
            1
            

            

                expect(page).to have_content(params[:title])
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

              end
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

              it 'can delete an book' do
          
    93. 
        
    
      
        
    
          
  93. 
            1
            

            

                click_link('Delete')
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

            
          
    95. 
        
    
      
        
    
          
  95. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

              end
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

            
          
    98. 
        
    
      
        
    
          
  98. 
            1
            

            

              it 'can view an book' do
          
    99. 
        
    
      
        
    
          
  99. 
            1
            

            

                click_link('View')
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

            
          
    101. 
        
    
      
        
    
          
  101. 
            1
            

            

                expect(page).to have_content(book.title)
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

              end
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

            
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

              it 'can edit an book' do
          
    105. 
        
    
      
        
    
          
  105. 
            1
            

            

                click_link('Edit')
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

            
          
    107. 
        
    
      
        
    
          
  107. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

            
          
    109. 
        
    
      
        
    
          
  109. 
            1
            

            

                click_button('Update Book')
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

            
          
    111. 
        
    
      
        
    
          
  111. 
            1
            

            

                expect(page).to have_content('New title')
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

              end
          
    113. 
        
    
      
        
    
          
  113. 
            
            

            

=======
>>>>>>> 1577aeb (Rebased)
            end
          
    114.

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Category' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:category) { create(:category) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              before do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                category
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                visit 'admin/categories'
          
    15. 
        
    
      
        
    
          
  15. 
            
=======
          
  16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  17. 
            7
>>>>>>> 752f0c0 (Featire specs)
=======
          
  18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  19. 
            7
>>>>>>> 08edf50 (Featire specs)
=======
          
  20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  21. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  27. 
            1
            

            

                  visit "books/#{book.id}"
          
    28. 
        
    
      
        
    
          
  28. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
=======
          
  30. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  31. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  32. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  33. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  34. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  35. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  36. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                click_button('Create Category')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            
=======
          
  49. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  50. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  51. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  52. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  53. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  54. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  55. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  58. 
            1
            

            

                click_link('Delete')
          
    59. 
        
    
      
        
    
          
  59. 
=======
          
  60. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  61. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  62. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  63. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  64. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  66. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
=======
          
  68. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  69. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  70. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  71. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  72. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  73. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  74. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
            
=======
          
  78. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  79. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  80. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  81. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  82. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  83. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  84. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                click_link('View')
>>>>>>> 836a973 (Rebased)
=======
                click_link('View')
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                expect(page).to have_content(category.name)
>>>>>>> 836a973 (Rebased)
=======
                expect(page).to have_content(category.name)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
              end
>>>>>>> 836a973 (Rebased)
=======
              end
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

            
          
    91. 
        
    
      
        
    
          
  91. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
              it 'can edit an category' do
>>>>>>> 836a973 (Rebased)
=======
              it 'can edit an category' do
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                click_link('Edit')
>>>>>>> 836a973 (Rebased)
=======
                click_link('Edit')
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

            
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 836a973 (Rebased)
=======
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

            
          
    96. 
        
    
      
        
    
          
  96. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                click_button('Update Category')
>>>>>>> 836a973 (Rebased)
=======
                click_button('Update Category')
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
            
>>>>>>> 836a973 (Rebased)
=======
            
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  98. 
            1
=======
          
  99. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56ef3ac (Featire specs)
=======
          
  100. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  101. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
=======
          
  102. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  103. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  104. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  105. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  106. 
            1
>>>>>>> 836a973 (Rebased)
=======
          
  107. 
            1
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                expect(page).to have_content('New Genre')
>>>>>>> 836a973 (Rebased)
=======
                expect(page).to have_content('New Genre')
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
              end
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

            end
          
    110.

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  5. 
            2
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in billing' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            5
            

            

              let(:category_one) { create(:category) }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:category_two) { create(:category) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              let(:params) do
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                { title: FFaker::Book.title,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                  description: FFaker::Book.description,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  materials: 'Soft cover',
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#show book' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'show books info' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  visit "books/#{book.id}"
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'clicked Beck to results' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit "books/#{book.id}"
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when test read more' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'show read more' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    visit "books/#{book.id}"
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  it 'clicked read more', js: true do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    visit "books/#{book.id}"
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    click_link I18n.t('book_page.read_more')
=======
                    click_link 'Read More'
>>>>>>> ee78f39 (Rebased)
=======
                    click_link 'Read More'
>>>>>>> 836a973 (Rebased)
=======
                    click_link 'Read More'
>>>>>>> 1577aeb (Rebased)
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  48. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  50. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
          
  54. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  55. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
          
  56. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  57. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when quantity changes', js: true do
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  58. 
=======
          
  59. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  60. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  61. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  62. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  63. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  64. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  65. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  66. 
>>>>>>> 836a973 (Rebased)
=======
          
  67. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  68. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  69. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  70. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  before do
          
    71. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  71. 
            2
            

            

                    visit "books/#{book.id}"
          
    72. 
        
    
      
        
    
          
  72. 
            
            

            

            
          
    73. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  73. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
            1
=======
          
  77. 
=======
          
  78. 
>>>>>>> 1577aeb (Rebased)
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  79. 
            2
>>>>>>> 752f0c0 (Featire specs)
=======
          
  80. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  81. 
            2
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  82. 
=======
          
  83. 
>>>>>>> 836a973 (Rebased)
            2
            

            

=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    86. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  86. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
          
  87. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  88. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  89. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  90. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  91. 
            2
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
            

            

                    find('a', class: 'inc').click
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

                  end
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

            
          
    94. 
        
    
      
        
    
          
  94. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56ef3ac (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    95. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  95. 
=======
          
  96. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  97. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  98. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  99. 
>>>>>>> 836a973 (Rebased)
=======
          
  100. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
    101. 
        
    
      
        
    
          
  101. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  102. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  103. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  104. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  105. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
            
            

            

                  end
          
    106. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  106. 
=======
          
  107. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  108. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  109. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  110. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  111. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    112. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  112. 
=======
          
  113. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  114. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  115. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  116. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3dc272d (Featire specs)
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3dc272d (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
=======
>>>>>>> 9c0d812 (Featire specs)
                  it 'increase quantity' do
>>>>>>> 20256f8 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
          
    117. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  117. 
=======
          
  118. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  119. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  120. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  121. 
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 20256f8 (Featire specs)
<<<<<<< HEAD
          
  122. 
=======
          
  123. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  124. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
>>>>>>> 836a973 (Rebased)
          
    125. 
        
    
      
        
    
          
  125. 
=======
=======
          
  126. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  127. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
            
            

            

                  end
          
    128. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  128. 
=======
          
  129. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  130. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  131. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  132. 
>>>>>>> 08edf50 (Featire specs)
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    133. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  133. 
=======
          
  134. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  135. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  136. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  137. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
          
    138. 
        
    
      
        
    
          
  138. 
            1
            

            

                    find('a', class: 'dec').click
          
    139. 
        
    
      
        
    
          
  139. 
=======
          
  140. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
<<<<<<< HEAD
=======
                  it 'decrease quantity' do
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
          
    141. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  141. 
=======
          
  142. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  143. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  144. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  145. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
          
    146. 
        
    
      
        
    
          
  146. 
            
            

            

                  end
          
    147. 
        
    
      
        
    
          
  147. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    148. 
        
    
      
        
    
          
  148. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    149. 
        
    
      
        
    
          
  149. 
            1
            

            

                    find('a', class: 'dec').click
          
    150. 
        
    
      
        
    
          
  150. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price}")
          
    151. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  151. 
            
            

            

                  end
          
    152. 
        
    
      
        
    
          
  152. 
<<<<<<< HEAD
            
            

            

                end
          
    153. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  153. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    154. 
        
    
      
        
    
          
  154. 
=======
>>>>>>> 836a973 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    155. 
        
    
      
        
    
          
  155. 
=======
          
  156. 
>>>>>>> 1577aeb (Rebased)
            
            

            

              end
          
    157. 
        
    
      
        
    
          
  157. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                end
          
    158. 
        
    
      
        
    
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  158. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    159. 
        
    
      
        
    
          
  159. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    160. 
        
    
      
        
    
          
  160. 
            
            

            

              end
          
    161. 
        
    
      
        
    
          
  161. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
          
    162. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  162. 
            1
            

            

              describe '#catalog' do
          
    163. 
        
    
      
        
    
          
  163. 
            1
            

            

                describe 'filter by category' do
          
    164. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  164. 
=======
          
  165. 
>>>>>>> 836a973 (Rebased)
=======
          
  166. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
              describe '#catalog' do
          
    167. 
        
    
      
        
    
          
  167. 
            1
            

            

                describe 'filter by category' do
          
    168. 
        
    
      
        
    
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  168. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
              describe '#catalog' do
          
    169. 
        
    
      
        
    
          
  169. 
            1
            

            

                describe 'filter by category' do
          
    170. 
        
    
      
        
    
          
  170. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  before do
          
    171. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  171. 
=======
          
  172. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  173. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  174. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  175. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  176. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  177. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  178. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  179. 
>>>>>>> 836a973 (Rebased)
=======
          
  180. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  181. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  182. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  183. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.books.create(params)
          
    184. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  184. 
=======
          
  185. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  186. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  187. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  188. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  189. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  190. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  191. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  192. 
>>>>>>> 836a973 (Rebased)
=======
          
  193. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  194. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  195. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  196. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            2
            

            

                    visit books_path
          
    197. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  197. 
=======
          
  198. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  199. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  200. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  201. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  202. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  203. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  204. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  205. 
>>>>>>> 836a973 (Rebased)
=======
          
  206. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  207. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  208. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  209. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    210. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  210. 
=======
          
  211. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  212. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  213. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  214. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  215. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  216. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  217. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  218. 
>>>>>>> 836a973 (Rebased)
=======
          
  219. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  220. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  221. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  222. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    223. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  223. 
=======
          
  224. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  225. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  226. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  227. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  228. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  229. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  230. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  231. 
>>>>>>> 836a973 (Rebased)
=======
          
  232. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  233. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  234. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  235. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  after do
          
    236. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  236. 
=======
          
  237. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  238. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  239. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  240. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  241. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  242. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  243. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  244. 
>>>>>>> 836a973 (Rebased)
=======
          
  245. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  246. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  247. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  248. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.destroy
          
    249. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  249. 
=======
          
  250. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  251. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  252. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  253. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  254. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  255. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  256. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  257. 
>>>>>>> 836a973 (Rebased)
=======
          
  258. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  259. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  260. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  261. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    262. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  262. 
=======
          
  263. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  264. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  265. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  266. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  267. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  268. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  269. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  270. 
>>>>>>> 836a973 (Rebased)
=======
          
  271. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  272. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  273. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  274. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    275. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  275. 
=======
          
  276. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  277. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  278. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  279. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  280. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  281. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  282. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  283. 
>>>>>>> 836a973 (Rebased)
=======
          
  284. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  285. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  286. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  287. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'show book count for category' do
          
    288. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  288. 
=======
          
  289. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  290. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  291. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  292. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  293. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  294. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  295. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  296. 
>>>>>>> 836a973 (Rebased)
=======
          
  297. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  298. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  299. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  300. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
    301. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  301. 
=======
          
  302. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  303. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  304. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  305. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  306. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  307. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  308. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  309. 
>>>>>>> 836a973 (Rebased)
=======
          
  310. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  311. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  312. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  313. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    314. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  314. 
=======
          
  315. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  316. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  317. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  318. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  319. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  320. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  321. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  322. 
>>>>>>> 836a973 (Rebased)
=======
          
  323. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  324. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  325. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  326. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    327. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  327. 
            1
            

            

                  it 'filter book by category' do
          
    328. 
        
    
      
        
    
          
  328. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    329. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  329. 
=======
          
  330. 
>>>>>>> 836a973 (Rebased)
=======
          
  331. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                  it 'filter book by category' do
          
    332. 
        
    
      
        
    
          
  332. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    333. 
        
    
      
        
    
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  333. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  it 'filter book by category' do
          
    334. 
        
    
      
        
    
          
  334. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    335. 
        
    
      
        
    
          
  335. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                      click_on category_one.name
          
    336. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  336. 
=======
          
  337. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  338. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  339. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  340. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  341. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  342. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  343. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  344. 
>>>>>>> 836a973 (Rebased)
=======
          
  345. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  346. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  347. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  348. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                    end
          
    349. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  349. 
=======
          
  350. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  351. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  352. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  353. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  354. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  355. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  356. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  357. 
>>>>>>> 836a973 (Rebased)
=======
          
  358. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  359. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  360. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  361. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    362. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  362. 
=======
          
  363. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  364. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  365. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  366. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  367. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  368. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  369. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  370. 
>>>>>>> 836a973 (Rebased)
=======
          
  371. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  372. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  373. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  374. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    375. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  375. 
=======
          
  376. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  377. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  378. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  379. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  380. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  381. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  382. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  383. 
>>>>>>> 836a973 (Rebased)
=======
          
  384. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  385. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  386. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  387. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    388. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  388. 
=======
          
  389. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  390. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  391. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  392. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  393. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  394. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  395. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  396. 
>>>>>>> 836a973 (Rebased)
=======
          
  397. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  398. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  399. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  400. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    401. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  401. 
=======
          
  402. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  403. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  404. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  405. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  406. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  407. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  408. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  409. 
>>>>>>> 836a973 (Rebased)
=======
          
  410. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  411. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  412. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  413. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    414. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  414. 
=======
          
  415. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  416. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  417. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  418. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  419. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  420. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  421. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  422. 
>>>>>>> 836a973 (Rebased)
=======
          
  423. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  424. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  425. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  426. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                describe 'filter by all books' do
          
    427. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  427. 
=======
          
  428. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  429. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  430. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  431. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  432. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  433. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  434. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  435. 
>>>>>>> 836a973 (Rebased)
=======
          
  436. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  437. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  438. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  439. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  before do
          
    440. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  440. 
=======
          
  441. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  442. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  443. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  444. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  445. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  446. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  447. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  448. 
>>>>>>> 836a973 (Rebased)
=======
          
  449. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  450. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  451. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  452. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.books.create(params)
          
    453. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  453. 
            2
            

            

                    category_two.books.create(params)
          
    454. 
        
    
      
        
    
          
  454. 
            
            

            

            
          
    455. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  455. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 836a973 (Rebased)
=======
                    visit books_path
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    456. 
        
    
      
        
    
          
  456. 
            
            

            

            
          
    457. 
        
    
      
        
    
          
  457. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                    click_on I18n.t('catalog_page.all')
>>>>>>> 836a973 (Rebased)
=======
                    click_on I18n.t('catalog_page.all')
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    458. 
        
    
      
        
    
          
  458. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
          
    459. 
        
    
      
        
    
          
  459. 
            2
            

            

                    click_on 'All'
          
    460. 
        
    
      
        
    
          
  460. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  end
          
    461. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  461. 
=======
          
  462. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  463. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  464. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  465. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  466. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  467. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  468. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  469. 
>>>>>>> 836a973 (Rebased)
=======
          
  470. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  471. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  472. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  473. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    474. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  474. 
=======
          
  475. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  476. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  477. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  478. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  479. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  480. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  481. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  482. 
>>>>>>> 836a973 (Rebased)
=======
          
  483. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  484. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  485. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  486. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  after do
          
    487. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  487. 
=======
          
  488. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  489. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  490. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  491. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  492. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  493. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  494. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  495. 
>>>>>>> 836a973 (Rebased)
=======
          
  496. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  497. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  498. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  499. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.destroy
          
    500. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  500. 
=======
          
  501. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  502. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  503. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  504. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  505. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  506. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  507. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  508. 
>>>>>>> 836a973 (Rebased)
=======
          
  509. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  510. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  511. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  512. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_two.destroy
          
    513. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  513. 
=======
          
  514. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  515. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  516. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  517. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  518. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  519. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  520. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  521. 
>>>>>>> 836a973 (Rebased)
=======
          
  522. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  523. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  524. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  525. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    526. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  526. 
=======
          
  527. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  528. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  529. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  530. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  531. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  532. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  533. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  534. 
>>>>>>> 836a973 (Rebased)
=======
          
  535. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  536. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  537. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  538. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    539. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  539. 
=======
          
  540. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  541. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  542. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  543. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  544. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  545. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  546. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  547. 
>>>>>>> 836a973 (Rebased)
=======
          
  548. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  549. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  550. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  551. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'shown books for first category' do
          
    552. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  552. 
=======
          
  553. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  554. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  555. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  556. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  557. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  558. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  559. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  560. 
>>>>>>> 836a973 (Rebased)
=======
          
  561. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  562. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  563. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  564. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    565. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  565. 
=======
          
  566. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  567. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  568. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  569. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  570. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  571. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  572. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  573. 
>>>>>>> 836a973 (Rebased)
=======
          
  574. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  575. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  576. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  577. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    578. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  578. 
=======
          
  579. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  580. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  581. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  582. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  583. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  584. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  585. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  586. 
>>>>>>> 836a973 (Rebased)
=======
          
  587. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  588. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  589. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  590. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    591. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  591. 
=======
          
  592. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  593. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  594. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  595. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  596. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  597. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  598. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  599. 
>>>>>>> 836a973 (Rebased)
=======
          
  600. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  601. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  602. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  603. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'shown books for second category' do
          
    604. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  604. 
=======
          
  605. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  606. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  607. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  608. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  609. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  610. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  611. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  612. 
>>>>>>> 836a973 (Rebased)
=======
          
  613. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  614. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  615. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  616. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
    617. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  617. 
            
            

            

                  end
          
    618. 
        
    
      
        
    
          
  618. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
            
            

            

                end
          
    619. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  619. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    620. 
        
    
      
        
    
          
  620. 
=======
>>>>>>> 836a973 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                end
          
    621. 
        
    
      
        
    
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  621. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    622. 
        
    
      
        
    
          
  622. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    623. 
        
    
      
        
    
          
  623. 
            
            

            

              end
          
    624. 
        
    
      
        
    
          
  624. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
          
    625. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  625. 
=======
          
  626. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  627. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  628. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  629. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  630. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  631. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  632. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  633. 
>>>>>>> 836a973 (Rebased)
=======
          
  634. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  635. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  636. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  637. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'load_more' do
          
    638. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  638. 
=======
          
  639. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  640. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  641. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  642. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  643. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  644. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  645. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  646. 
>>>>>>> 836a973 (Rebased)
=======
          
  647. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  648. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  649. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  650. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                before do
          
    651. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  651. 
=======
          
  652. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  653. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  654. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  655. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  656. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  657. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  658. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  659. 
>>>>>>> 836a973 (Rebased)
=======
          
  660. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  661. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  662. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  663. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  24.times do
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                  24.times do
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                  24.times do
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                  24.times do
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    664. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  664. 
=======
          
  665. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  666. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  667. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  668. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  669. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  670. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  671. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  672. 
>>>>>>> 836a973 (Rebased)
=======
          
  673. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  674. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  675. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  676. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            72
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    books << create(:book)
          
    677. 
        
    
      
        
    
          
  677. 
            
            

            

                  end
          
    678. 
        
    
      
        
    
          
  678. 
            
            

            

                end
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
    679. 
        
    
      
        
    
          
  679. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    680. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  680. 
            4
=======
          
  681. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  682. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  683. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  684. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  685. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  686. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  687. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    688. 
        
    
      
        
    
          
  688. 
            
            

            

            
          
    689. 
        
    
      
        
    
          
  689. 
            4
            

            

                let(:books) { [] }
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    690. 
        
    
      
        
    
          
  690. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    691. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  691. 
            4
=======
          
  692. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  693. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  694. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  695. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  696. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  697. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  698. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    699. 
        
    
      
        
    
          
  699. 
            
            

            

            
          
    700. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  700. 
            1
=======
          
  701. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56ef3ac (Featire specs)
=======
          
  702. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
          
  703. 
            4
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
=======
          
  704. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  705. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20256f8 (Featire specs)
=======
          
  706. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  707. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    708. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  708. 
            1
            

            

                  visit books_path
          
    709. 
        
    
      
        
    
          
  709. 
=======
          
  710. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  711. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  712. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  713. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  714. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  715. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  716. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    717. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  717. 
=======
          
  718. 
>>>>>>> 836a973 (Rebased)
=======
          
  719. 
>>>>>>> 1577aeb (Rebased)
            1
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    720. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  720. 
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  721. 
>>>>>>> 836a973 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    722. 
        
    
      
        
    
          
  722. 
            
            

            

            
          
    723. 
        
    
      
        
    
          
  723. 
=======
          
  724. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

                  find('a', id: 'view_more', class: 'view_more').click
          
    725. 
        
    
      
        
    
          
  725. 
=======
          
  726. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  727. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  728. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  729. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  730. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  731. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  732. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    733. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  733. 
            1
            

            

                it 'show books without view more button' do
          
    734. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  734. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    735. 
        
    
      
        
    
          
  735. 
            
            

            

            
          
    736. 
        
    
      
        
    
          
  736. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 836a973 (Rebased)
=======
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    737. 
        
    
      
        
    
          
  737. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
          
    738. 
        
    
      
        
    
          
  738. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
    739. 
        
    
      
        
    
          
  739. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                end
          
    740. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  740. 
=======
          
  741. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  742. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  743. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  744. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  745. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  746. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  747. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  748. 
>>>>>>> 836a973 (Rebased)
=======
          
  749. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  750. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  751. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  752. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    753. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  753. 
            1
            

            

                context 'when view more' do
          
    754. 
        
    
      
        
    
          
  754. 
            1
            

            

                  it 'show books with view more button' do
          
    755. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  755. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    756. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  756. 
            
=======
          
  757. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  758. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  759. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  760. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  761. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  762. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  763. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    764. 
        
    
      
        
    
          
  764. 
=======
          
  765. 
>>>>>>> 836a973 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    766. 
        
    
      
        
    
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  766. 
            
=======
          
  767. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  768. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  769. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  770. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  771. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  772. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  773. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    774. 
        
    
      
        
    
          
  774. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    775. 
        
    
      
        
    
          
  775. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    776. 
        
    
      
        
    
          
  776. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
    777. 
        
    
      
        
    
          
  777. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  end
          
    778. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  778. 
=======
          
  779. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  780. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  781. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  782. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  783. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  784. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  785. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  786. 
>>>>>>> 836a973 (Rebased)
=======
          
  787. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  788. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  789. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  790. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    791. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  791. 
=======
          
  792. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  793. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  794. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  795. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  796. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  797. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  798. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  799. 
>>>>>>> 836a973 (Rebased)
=======
          
  800. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  801. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  802. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  803. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'show loaded books', js: true do
          
    804. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  804. 
            1
            

            

                    visit books_path
          
    805. 
        
    
      
        
    
          
  805. 
            
            

            

            
          
    806. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  806. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                    find('a', class: 'view_more').click
>>>>>>> 836a973 (Rebased)
=======
                    find('a', class: 'view_more').click
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    807. 
        
    
      
        
    
          
  807. 
            
            

            

            
          
    808. 
        
    
      
        
    
          
  808. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 836a973 (Rebased)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    809. 
        
    
      
        
    
          
  809. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
    810. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  810. 
            
=======
          
  811. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  812. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  813. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  814. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  815. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  816. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  817. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    818. 
        
    
      
        
    
          
  818. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    819. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  819. 
            
=======
          
  820. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  821. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  822. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  823. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  824. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  825. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  826. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    827. 
        
    
      
        
    
          
  827. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    828. 
        
    
      
        
    
          
  828. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    829. 
        
    
      
        
    
          
  829. 
            
            

            

              end
          
    830. 
        
    
      
        
    
          
  830. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
          
    831. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  831. 
=======
          
  832. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  833. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  834. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  835. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  836. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  837. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  838. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  839. 
>>>>>>> 836a973 (Rebased)
=======
          
  840. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  841. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  842. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  843. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'sort' do
          
    844. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  844. 
=======
          
  845. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  846. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  847. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  848. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  849. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  850. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  851. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  852. 
>>>>>>> 836a973 (Rebased)
=======
          
  853. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  854. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  855. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  856. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            1
            

            

                shared_examples 'sort test' do
          
    857. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  857. 
=======
          
  858. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  859. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  860. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  861. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  862. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  863. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  864. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  865. 
>>>>>>> 836a973 (Rebased)
=======
          
  866. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  867. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  868. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  869. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            5
            

            

                  it 'sort books' do
          
    870. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  870. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
    871. 
        
    
      
        
    
          
  871. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
    872. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  872. 
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 836a973 (Rebased)
=======
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    873. 
        
    
      
        
    
          
  873. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    874. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  874. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  875. 
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  876. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
    877. 
        
    
      
        
    
          
  877. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  878. 
>>>>>>> 836a973 (Rebased)
=======
          
  879. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    880. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  880. 
=======
          
  881. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  882. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  883. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  884. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  885. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  886. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  887. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  888. 
>>>>>>> 836a973 (Rebased)
=======
          
  889. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  890. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  891. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  892. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            5
            

            

                    visit books_path
          
    893. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  893. 
=======
          
  894. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  895. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  896. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  897. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  898. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  899. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  900. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  901. 
>>>>>>> 836a973 (Rebased)
=======
          
  902. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  903. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  904. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  905. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    906. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  906. 
=======
          
  907. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  908. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  909. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  910. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  911. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  912. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  913. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  914. 
>>>>>>> 836a973 (Rebased)
=======
          
  915. 
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  916. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  917. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
          
  918. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
    919. 
        
    
      
        
    
          
  919. 
            
            

            

                              id: 'menu').click
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    920. 
        
    
      
        
    
          
  920. 
            
            

            

            
          
    921. 
        
    
      
        
    
          
  921. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
    922. 
        
    
      
        
    
          
  922. 
            5
            

            

                      click_link button
          
    923. 
        
    
      
        
    
          
  923. 
            
            

            

                    end
          
    924. 
        
    
      
        
    
          
  924. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
    925. 
        
    
      
        
    
          
  925. 
            
            

            

                  end
          
    926. 
        
    
      
        
    
          
  926. 
            
            

            

                end
          
    927. 
        
    
      
        
    
          
  927. 
            
            

            

            
          
    928. 
        
    
      
        
    
          
  928. 
            1
            

            

                context 'when sort by title A to Z' do
          
    929. 
        
    
      
        
    
          
  929. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 836a973 (Rebased)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    930. 
        
    
      
        
    
          
  930. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    931. 
        
    
      
        
    
          
  931. 
            
            

            

            
          
    932. 
        
    
      
        
    
          
  932. 
            1
            

            

                  include_examples 'sort test'
          
    933. 
        
    
      
        
    
          
  933. 
            
            

            

                end
          
    934. 
        
    
      
        
    
          
  934. 
            
            

            

            
          
    935. 
        
    
      
        
    
          
  935. 
            1
            

            

                context 'when sort by title Z to A' do
          
    936. 
        
    
      
        
    
          
  936. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 836a973 (Rebased)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    937. 
        
    
      
        
    
          
  937. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    938. 
        
    
      
        
    
          
  938. 
            
            

            

            
          
    939. 
        
    
      
        
    
          
  939. 
            1
            

            

                  include_examples 'sort test'
          
    940. 
        
    
      
        
    
          
  940. 
            
            

            

                end
          
    941. 
        
    
      
        
    
          
  941. 
            
            

            

            
          
    942. 
        
    
      
        
    
          
  942. 
            1
            

            

                context 'when sort by price High to Low' do
          
    943. 
        
    
      
        
    
          
  943. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 836a973 (Rebased)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    944. 
        
    
      
        
    
          
  944. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    945. 
        
    
      
        
    
          
  945. 
            
            

            

            
          
    946. 
        
    
      
        
    
          
  946. 
            1
            

            

                  include_examples 'sort test'
          
    947. 
        
    
      
        
    
          
  947. 
            
            

            

                end
          
    948. 
        
    
      
        
    
          
  948. 
            
            

            

            
          
    949. 
        
    
      
        
    
          
  949. 
            1
            

            

                context 'when sort by price Low to High' do
          
    950. 
        
    
      
        
    
          
  950. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 836a973 (Rebased)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    951. 
        
    
      
        
    
          
  951. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    952. 
        
    
      
        
    
          
  952. 
            
            

            

            
          
    953. 
        
    
      
        
    
          
  953. 
            1
            

            

                  include_examples 'sort test'
          
    954. 
        
    
      
        
    
          
  954. 
            
            

            

                end
          
    955. 
        
    
      
        
    
          
  955. 
            
            

            

            
          
    956. 
        
    
      
        
    
          
  956. 
            1
            

            

                context 'when sort by newest' do
          
    957. 
        
    
      
        
    
          
  957. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 836a973 (Rebased)
=======
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
    958. 
        
    
      
        
    
          
  958. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    959. 
        
    
      
        
    
          
  959. 
            
            

            

            
          
    960. 
        
    
      
        
    
          
  960. 
            1
            

            

                  include_examples 'sort test'
          
    961. 
        
    
      
        
    
          
  961. 
            
            

            

                end
          
    962. 
        
    
      
        
    
          
  962. 
            
            

            

              end
          
    963. 
        
    
      
        
    
          
  963. 
            
            

            

            end
          
    964.

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 49 relevant lines. 49 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe 'Get Started' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                it 'on click move to catalog page' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  visit root_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  click_on 'Get Started'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe 'navbar' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                it 'on click home move to root-path' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  visit books_path
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  find('a', id: 'root').click
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  books_category
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  visit root_path
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  within('ul', id: 'nav') do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                context 'when guest' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  it 'on click login go to login page' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    visit root_path
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                    end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                  end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                    visit root_path
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                    end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                context 'when user', js: true do
          
    63. 
        
    
      
        
    
          
  63. 
            4
            

            

                  let(:user) { create(:user) }
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                  before do
          
    66. 
        
    
      
        
    
          
  66. 
            3
            

            

                    sign_in(user)
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                  it 'on click account show settings' do
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                    visit root_path
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    click_on I18n.t('header.account')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                  end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            
          
    77. 
        
    
      
        
    
          
  77. 
            1
            

            

                  it 'on click account show log_out' do
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                    visit root_path
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    click_on I18n.t('header.account')
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                  end
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

            
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

                  it 'log_out' do
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

                    visit root_path
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                    click_on I18n.t('header.account')
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

                  end
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

              end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            end
          
    97.

spec/feature/login_spec.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) 100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) 19 relevant lines. 19 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#login' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  visit new_user_session_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully login' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'login' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                context 'when unsuccessfully login' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  it 'didn`t login' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            end
          
    36.

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              describe '#new_password' do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                it 'change password' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'not validate password' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  visit new_user_password_path
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  fill_in 'email', with: user.email
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#sing_up' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

                  visit new_user_registration_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully sing_up' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'sing_up users' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when users is already exits' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                  it 'sing_up users' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                    end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  it 'didn`t sing_up' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                    end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                  end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            end
          
    52.

spec/feature/review_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 28 relevant lines. 28 lines covered and ======= 30 relevant lines. 30 lines covered and >>>>>>> ee78f39 (Rebased) ======= 30 relevant lines. 30 lines covered and >>>>>>> 836a973 (Rebased) ======= 30 relevant lines. 30 lines covered and >>>>>>> 1577aeb (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Review', type: :feature do
=======
            require_relative '../rails_helper'
>>>>>>> ee78f39 (Rebased)
=======
            require_relative '../rails_helper'
>>>>>>> 836a973 (Rebased)
=======
            require_relative '../rails_helper'
>>>>>>> 1577aeb (Rebased)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request authentication helper methods'
=======
            require_relative '../support/shared_context'
>>>>>>> ee78f39 (Rebased)
=======
            require_relative '../support/shared_context'
>>>>>>> 836a973 (Rebased)
=======
            require_relative '../support/shared_context'
>>>>>>> 1577aeb (Rebased)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
=======
          
  5. 
>>>>>>> ee78f39 (Rebased)
=======
          
  6. 
>>>>>>> 836a973 (Rebased)
=======
          
  7. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            3
=======
          
  9. 
            1
>>>>>>> ee78f39 (Rebased)
=======
          
  10. 
            1
>>>>>>> 836a973 (Rebased)
=======
          
  11. 
            1
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:user) { create(:user).decorate }
=======
            RSpec.describe 'Review', type: :feature do
>>>>>>> ee78f39 (Rebased)
=======
            RSpec.describe 'Review', type: :feature do
>>>>>>> 836a973 (Rebased)
=======
            RSpec.describe 'Review', type: :feature do
>>>>>>> 1577aeb (Rebased)
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
            3
=======
          
  13. 
            1
>>>>>>> ee78f39 (Rebased)
=======
          
  14. 
            1
>>>>>>> 836a973 (Rebased)
=======
          
  15. 
            1
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book).decorate }
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
              include_context 'with api request authentication helper methods'
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              include_context 'with api request global before and after hooks'
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  18. 
            1
=======
          
  19. 
            3
>>>>>>> ee78f39 (Rebased)
=======
          
  20. 
            3
>>>>>>> 836a973 (Rebased)
=======
          
  21. 
            3
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              before do
=======
              let(:user) { FactoryBot.create(:user).decorate }
>>>>>>> ee78f39 (Rebased)
=======
              let(:user) { FactoryBot.create(:user).decorate }
>>>>>>> 836a973 (Rebased)
=======
              let(:user) { FactoryBot.create(:user).decorate }
>>>>>>> 1577aeb (Rebased)
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  22. 
            2
=======
          
  23. 
            3
>>>>>>> ee78f39 (Rebased)
=======
          
  24. 
            3
>>>>>>> 836a973 (Rebased)
=======
          
  25. 
            3
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                sign_in(user)
=======
              let(:book) { FactoryBot.create(:book).decorate }
>>>>>>> ee78f39 (Rebased)
=======
              let(:book) { FactoryBot.create(:book).decorate }
>>>>>>> 836a973 (Rebased)
=======
              let(:book) { FactoryBot.create(:book).decorate }
>>>>>>> 1577aeb (Rebased)
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  28. 
            1
            

            

              before do
          
    29. 
        
    
      
        
    
          
  29. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                visit book_path(book)
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
=======
                sign_in(user)
>>>>>>> ee78f39 (Rebased)
=======
                sign_in(user)
>>>>>>> 836a973 (Rebased)
=======
                sign_in(user)
>>>>>>> 1577aeb (Rebased)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  32. 
            1
            

            

              shared_examples 'review' do
          
    33. 
        
    
      
        
    
          
  33. 
=======
          
  34. 
>>>>>>> ee78f39 (Rebased)
=======
          
  35. 
>>>>>>> 836a973 (Rebased)
=======
          
  36. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'review' do
=======
                visit book_path(book)
>>>>>>> ee78f39 (Rebased)
=======
                visit book_path(book)
>>>>>>> 836a973 (Rebased)
=======
                visit book_path(book)
>>>>>>> 1577aeb (Rebased)
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
            2
=======
          
  38. 
            
>>>>>>> ee78f39 (Rebased)
=======
          
  39. 
            
>>>>>>> 836a973 (Rebased)
=======
          
  40. 
            
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('i', id: rating).click
=======
              end
>>>>>>> ee78f39 (Rebased)
=======
              end
>>>>>>> 836a973 (Rebased)
=======
              end
>>>>>>> 1577aeb (Rebased)
          
    41. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  41. 
=======
          
  42. 
>>>>>>> ee78f39 (Rebased)
=======
          
  43. 
>>>>>>> 836a973 (Rebased)
=======
          
  44. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  45. 
            1
            

            

              shared_examples 'review' do
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  46. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
=======
                it 'review' do
>>>>>>> ee78f39 (Rebased)
=======
                it 'review' do
>>>>>>> 836a973 (Rebased)
=======
                it 'review' do
>>>>>>> 1577aeb (Rebased)
          
    47. 
        
    
      
        
    
          
  47. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
=======
                  find('i', id: rating).click
>>>>>>> ee78f39 (Rebased)
=======
                  find('i', id: rating).click
>>>>>>> 836a973 (Rebased)
=======
                  find('i', id: rating).click
>>>>>>> 1577aeb (Rebased)
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  click_on I18n.t('review.post')
=======
                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
>>>>>>> ee78f39 (Rebased)
=======
                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
>>>>>>> 836a973 (Rebased)
=======
                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
>>>>>>> 1577aeb (Rebased)
          
    50. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  50. 
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  51. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
    52. 
        
    
      
        
    
          
  52. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  53. 
=======
          
  54. 
>>>>>>> ee78f39 (Rebased)
=======
          
  55. 
>>>>>>> 836a973 (Rebased)
=======
          
  56. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(page).to have_content(result)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                end
=======
                  click_on I18n.t('review.post')
>>>>>>> ee78f39 (Rebased)
=======
                  click_on I18n.t('review.post')
>>>>>>> 836a973 (Rebased)
=======
                  click_on I18n.t('review.post')
>>>>>>> 1577aeb (Rebased)
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
            
          
    59. 
        
    
      
        
    
          
  59. 
            2
            

            

                  expect(page).to have_content(result)
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
              end
          
    62. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  62. 
=======
          
  63. 
>>>>>>> ee78f39 (Rebased)
=======
          
  64. 
>>>>>>> 836a973 (Rebased)
=======
          
  65. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    66. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  66. 
=======
          
  67. 
>>>>>>> ee78f39 (Rebased)
=======
          
  68. 
>>>>>>> 836a973 (Rebased)
=======
          
  69. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

              describe '#post review', js: true do
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  70. 
=======
          
  71. 
>>>>>>> ee78f39 (Rebased)
=======
          
  72. 
>>>>>>> 836a973 (Rebased)
=======
          
  73. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

                context 'when review posted' do
          
    74. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  74. 
=======
          
  75. 
>>>>>>> ee78f39 (Rebased)
=======
          
  76. 
>>>>>>> 836a973 (Rebased)
=======
          
  77. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    78. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  78. 
=======
          
  79. 
>>>>>>> ee78f39 (Rebased)
=======
          
  80. 
>>>>>>> 836a973 (Rebased)
=======
          
  81. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:title_words) { 3 }
=======
                  let(:title_words) { 5 }
>>>>>>> ee78f39 (Rebased)
=======
                  let(:title_words) { 5 }
>>>>>>> 836a973 (Rebased)
=======
                  let(:title_words) { 5 }
>>>>>>> 1577aeb (Rebased)
          
    82. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  82. 
=======
          
  83. 
>>>>>>> ee78f39 (Rebased)
=======
          
  84. 
>>>>>>> 836a973 (Rebased)
=======
          
  85. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:body_words) { 5 }
=======
                  let(:body_words) { 10 }
>>>>>>> ee78f39 (Rebased)
=======
                  let(:body_words) { 10 }
>>>>>>> 836a973 (Rebased)
=======
                  let(:body_words) { 10 }
>>>>>>> 1577aeb (Rebased)
          
    86. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  86. 
=======
          
  87. 
>>>>>>> ee78f39 (Rebased)
=======
          
  88. 
>>>>>>> 836a973 (Rebased)
=======
          
  89. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

                  let(:result) { user.name_or_email }
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  90. 
            
            

            

            
          
    91. 
        
    
      
        
    
          
  91. 
            1
            

            

                  include_examples 'review'
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

                end
          
    93. 
        
    
      
        
    
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  93. 
            
            

            

            
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                context 'when review not been posted' do
          
    95. 
        
    
      
        
    
          
  95. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    96. 
        
    
      
        
    
          
  96. 
            2
            

            

                  let(:title_words) { 80 }
          
    97. 
        
    
      
        
    
          
  97. 
            2
            

            

                  let(:body_words) { 30 }
          
    98. 
        
    
      
        
    
          
  98. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
    99. 
        
    
      
        
    
          
  99. 
            
            

            

            
          
    100. 
        
    
      
        
    
          
  100. 
            1
            

            

=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
                  include_examples 'review'
          
    101. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  101. 
=======
          
  102. 
>>>>>>> ee78f39 (Rebased)
=======
          
  103. 
>>>>>>> 836a973 (Rebased)
=======
          
  104. 
>>>>>>> 1577aeb (Rebased)
            
            

            

                end
          
    105. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  105. 
            
            

            

            
          
    106. 
        
    
      
        
    
          
  106. 
            1
            

            

                context 'when review not been posted' do
          
    107. 
        
    
      
        
    
          
  107. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    108. 
        
    
      
        
    
          
  108. 
            2
            

            

                  let(:title_words) { 80 }
          
    109. 
        
    
      
        
    
          
  109. 
            2
            

            

                  let(:body_words) { 30 }
          
    110. 
        
    
      
        
    
          
  110. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
    111. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
          
  111. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
            
          
    112. 
        
    
      
        
    
          
  112. 
            1
            

            

                  include_examples 'review'
          
    113. 
        
    
      
        
    
          
  113. 
            
            

            

                end
          
    114. 
        
    
      
        
    
          
  114. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
              end
          
    115. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  115. 
=======
          
  116. 
>>>>>>> ee78f39 (Rebased)
=======
          
  117. 
>>>>>>> 836a973 (Rebased)
=======
          
  118. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            end
          
    119.

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              before do
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

                sign_in(user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                visit edit_user_path(user.id)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#email_change' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'change email' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  within('div', id: 'email') do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  user.confirm
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe '#password_change' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when error' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'didnt change password' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    within('div', id: 'password') do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                    end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    user.confirm
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successful' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'didnt change password' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    within('div', id: 'password') do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                    end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    user.confirm
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in shipping' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe '#sing_up' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                context 'when successfully sing_up' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  before do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                    visit new_user_registration_path
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  it 'sing_up user' do
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  it 'didn`t sing_up' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    visit new_user_registration_path
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                    end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#login' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                before do
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                  user_second.confirm
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successfully login' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'login' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    visit new_user_session_path
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                    end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

                  end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

            
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

                context 'when unsuccessfully login' do
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  it 'didn`t login' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                    visit new_user_session_path
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

                    end
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

                end
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

              end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            end
          
    77.

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AdminUser, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              context 'when validations' do
          
    5. 
        
    
      
        
    
          
  5. 
            2
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
            

            

                it { is_expected.to validate_presence_of(:email) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                it { is_expected.to validate_presence_of(:password) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
<<<<<<< HEAD
<<<<<<< HEAD
            1
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:email) }
=======
            RSpec.describe Author, type: :model do
>>>>>>> ee78f39 (Rebased)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            2
=======
          
  3. 
            1
>>>>>>> ee78f39 (Rebased)
            

            

<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:password) }
=======
              describe 'author' do
          
    4. 
        
    
      
        
    
          
  4. 
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                context 'when validations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> 836a973 (Rebased)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 1577aeb (Rebased)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
>>>>>>> ee78f39 (Rebased)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
=======
          
  2. 
>>>>>>> 836a973 (Rebased)
=======
          
  3. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe Author, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
              describe 'author' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                context 'when associations' do
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe AuthorsBook, type: :model do
<<<<<<< HEAD
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'authors_book' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
<<<<<<< HEAD
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'billing' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Book, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:year_of_publication) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:quantity) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to validate_presence_of(:dimensions) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when associations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            end
          
    24.

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books_categories' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'category' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                context 'when associations' do
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Review, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'review' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:body) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                context 'when associations' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            end
          
    21.

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'shipping' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe User, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'author' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                context 'with associations' do
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe BookQuery do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              shared_examples 'sort test' do
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                it 'sort' do
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                  books
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

                  expect(test).to eq(result)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            3
            

            

              let(:titles) { %w[Adam Zimbabwe] }
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              let(:books_dates) do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              describe 'all books sort' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context 'when sort by title A to Z' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                  let(:books) do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    create(:book, title: titles.first)
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    create(:book, title: titles.second)
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            2
            

            

                  let(:result) { titles.second }
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                  include_examples 'sort test'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                context 'when sort title Z to A' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                  let(:books) do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    create(:book, title: titles.first)
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    create(:book, title: titles.second)
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                  end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                  let(:result) { titles.first }
          
    36. 
        
    
      
        
    
          
  36. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  include_examples 'sort test'
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                context 'when sort by price High to Low' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                  let(:books) do
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                    create(:book, price_cents: 75)
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    create(:book, price_cents: 23)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                  end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            2
            

            

                  let(:result) { 75 }
          
    48. 
        
    
      
        
    
          
  48. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                  include_examples 'sort test'
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                context 'when sort price Low to High' do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                  let(:books) do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                    create(:book, price_cents: 75)
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    create(:book, price_cents: 23)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                  end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            2
            

            

                  let(:result) { 23 }
          
    60. 
        
    
      
        
    
          
  60. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  include_examples 'sort test'
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

                end
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                context 'when sort by Newest' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                  let(:books) do
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
    68. 
        
    
      
        
    
          
  68. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                  end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            2
            

            

                  let(:result) { books_dates.first }
          
    72. 
        
    
      
        
    
          
  72. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                  include_examples 'sort test'
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

              end
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            end
          
    78.

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Author' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

              let(:old_name) { author.first_name }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

              let(:author) { create(:author) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              before do
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              it 'can create an author' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                visit 'admin/authors'
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                click_link('New Author')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

              it 'can delete an author' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                author
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                visit 'admin/authors'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

              it 'can view an author' do
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                author
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                visit 'admin/authors'
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                click_link('View')
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

              end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              it 'can edit an author' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                author
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                visit 'admin/authors'
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                click_link('Edit')
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

              end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            end
          
    58.

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            7
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book) }
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
              let(:category_one) { FactoryBot.create(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              let(:params) do
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            1
=======
          
  9. 
            4
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  10. 
            4
>>>>>>> 752f0c0 (Featire specs)
=======
          
  11. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  12. 
            4
>>>>>>> 08edf50 (Featire specs)
=======
          
  13. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  14. 
            4
>>>>>>> 7a02bbe (Featire specs)
=======
          
  15. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

                { title: FFaker::Book.title,
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                  description: FFaker::Book.description,
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  materials: 'Soft cover',
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              before do
          
    25. 
        
    
      
        
    
          
  25. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            6
            

            

                book
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            6
            

            

                visit 'admin/books'
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

              it 'can create an book' do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                click_link('New Book')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                click_button('Create Book')
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                expect(page).to have_content(params[:title])
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

              end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

              it 'can delete an book' do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                click_link('Delete')
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

              end
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

              it 'can view an book' do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                click_link('View')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                expect(page).to have_content(book.title)
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

              end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            1
            

            

              it 'can edit an book' do
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

                click_link('Edit')
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                click_button('Update Book')
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

            
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                expect(page).to have_content('New title')
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

              end
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

            
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

              context 'when image' do
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

                before do
          
    72. 
        
    
      
        
    
          
  72. 
            2
            

            

                  click_link('Edit')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

            
          
    76. 
        
    
      
        
    
          
  76. 
            2
            

            

                  click_on 'Update Book'
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

                end
          
    78. 
        
    
      
        
    
          
  78. 
            
            

            

            
          
    79. 
        
    
      
        
    
          
  79. 
            1
            

            

                it 'can add images to book' do
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

                end
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

            
          
    83. 
        
    
      
        
    
          
  83. 
            1
            

            

                it 'can delete images from book' do
          
    84. 
        
    
      
        
    
          
  84. 
            1
            

            

                  click_link('Edit')
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

            
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

                  click_link('Delete')
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

                end
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

              end
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            end
          
    92.

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Category' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:category) { create(:category) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              before do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                category
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                visit 'admin/categories'
          
    15. 
        
    
      
        
    
          
  15. 
            
=======
          
  16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  17. 
            7
>>>>>>> 752f0c0 (Featire specs)
=======
          
  18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  19. 
            7
>>>>>>> 08edf50 (Featire specs)
=======
          
  20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  21. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  27. 
            1
            

            

                  visit "books/#{book.id}"
          
    28. 
        
    
      
        
    
          
  28. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
=======
          
  30. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  31. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  32. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  33. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  34. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  35. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  36. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                click_button('Create Category')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            
=======
          
  49. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  50. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  51. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  52. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  53. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  54. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  55. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  58. 
            1
            

            

                click_link('Delete')
          
    59. 
        
    
      
        
    
          
  59. 
=======
          
  60. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  61. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  62. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  63. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  64. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  66. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
=======
          
  68. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  69. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  70. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  71. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  72. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  73. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  74. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
            
=======
          
  78. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  79. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  80. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  81. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  82. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  83. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  84. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

            
          
    91. 
        
    
      
        
    
          
  91. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

            
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

            
          
    96. 
        
    
      
        
    
          
  96. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  98. 
            1
=======
          
  99. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  100. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  101. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  102. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  103. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  104. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  105. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
    107. 
        
    
      
        
    
          
  107. 
            
            

            

            end
          
    108.

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            2
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in billing' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            5
            

            

              let(:category_one) { create(:category) }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:category_two) { create(:category) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              let(:params) do
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                { title: FFaker::Book.title,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                  description: FFaker::Book.description,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  materials: 'Soft cover',
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#show book' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'show books info' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  visit "books/#{book.id}"
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'clicked Beck to results' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit "books/#{book.id}"
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when test read more' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'show read more' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    visit "books/#{book.id}"
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  it 'clicked read more', js: true do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    visit "books/#{book.id}"
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
=======
          
  47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  50. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when quantity changes', js: true do
          
    54. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  54. 
=======
          
  55. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  56. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  58. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  60. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  61. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  before do
          
    62. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  62. 
            2
            

            

                    visit "books/#{book.id}"
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  64. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
            1
=======
          
  68. 
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  69. 
            2
>>>>>>> 752f0c0 (Featire specs)
=======
          
  70. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  71. 
            2
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  72. 
            2
            

            

                    find('a', class: 'inc').click
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
=======
          
  77. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  78. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  79. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
    80. 
        
    
      
        
    
          
  80. 
=======
          
  81. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  82. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  83. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  84. 
>>>>>>> 08edf50 (Featire specs)
            
            

            

                  end
          
    85. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  85. 
=======
          
  86. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  87. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  88. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  89. 
>>>>>>> 08edf50 (Featire specs)
            
            

            

            
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  90. 
=======
          
  91. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  92. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  93. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  94. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
          
    95. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  95. 
=======
          
  96. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  97. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  98. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  99. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

                  end
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    102. 
        
    
      
        
    
          
  102. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    103. 
        
    
      
        
    
          
  103. 
            1
            

            

                    find('a', class: 'dec').click
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price}")
          
    105. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  105. 
            
            

            

                  end
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

                end
          
    107. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  107. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

              end
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    111. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  111. 
            1
            

            

              describe '#catalog' do
          
    112. 
        
    
      
        
    
          
  112. 
            1
            

            

                describe 'filter by category' do
          
    113. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  113. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
              describe '#catalog' do
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

                describe 'filter by category' do
          
    115. 
        
    
      
        
    
          
  115. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  before do
          
    116. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  116. 
=======
          
  117. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  118. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  119. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  120. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  121. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  122. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  123. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.books.create(params)
          
    124. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  124. 
=======
          
  125. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  126. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  127. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  128. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  129. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  130. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  131. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    visit books_path
          
    132. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  132. 
=======
          
  133. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  134. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  135. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  136. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  137. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  138. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  139. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    140. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  140. 
=======
          
  141. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  142. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  143. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  144. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  145. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  146. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  147. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    148. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  148. 
=======
          
  149. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  150. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  151. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  152. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  153. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  154. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  155. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  after do
          
    156. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  156. 
=======
          
  157. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  158. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  159. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  160. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  161. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  162. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  163. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.destroy
          
    164. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  164. 
=======
          
  165. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  166. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  167. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  168. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  169. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  170. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  171. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    172. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  172. 
=======
          
  173. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  174. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  175. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  176. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  177. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  178. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  179. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    180. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  180. 
=======
          
  181. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  182. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  183. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  184. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  185. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  186. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  187. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'show book count for category' do
          
    188. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  188. 
=======
          
  189. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  190. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  191. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  192. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  193. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  194. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  195. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
    196. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  196. 
=======
          
  197. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  198. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  199. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  200. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  201. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  202. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  203. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    204. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  204. 
=======
          
  205. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  206. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  207. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  208. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  209. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  210. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  211. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    212. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  212. 
            1
            

            

                  it 'filter book by category' do
          
    213. 
        
    
      
        
    
          
  213. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    214. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  214. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  it 'filter book by category' do
          
    215. 
        
    
      
        
    
          
  215. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    216. 
        
    
      
        
    
          
  216. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                      click_on category_one.name
          
    217. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  217. 
=======
          
  218. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  219. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  220. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  221. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  222. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  223. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  224. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                    end
          
    225. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  225. 
=======
          
  226. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  227. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  228. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  229. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  230. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  231. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  232. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    233. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  233. 
=======
          
  234. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  235. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  236. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  237. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  238. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  239. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  240. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    241. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  241. 
=======
          
  242. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  243. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  244. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  245. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  246. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  247. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  248. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    249. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  249. 
=======
          
  250. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  251. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  252. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  253. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  254. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  255. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  256. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    257. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  257. 
=======
          
  258. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  259. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  260. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  261. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  262. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  263. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  264. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    265. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  265. 
=======
          
  266. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  267. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  268. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  269. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  270. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  271. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  272. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                describe 'filter by all books' do
          
    273. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  273. 
=======
          
  274. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  275. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  276. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  277. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  278. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  279. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  280. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  before do
          
    281. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  281. 
=======
          
  282. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  283. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  284. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  285. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  286. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  287. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  288. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.books.create(params)
          
    289. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  289. 
            2
            

            

                    category_two.books.create(params)
          
    290. 
        
    
      
        
    
          
  290. 
            
            

            

            
          
    291. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  291. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    292. 
        
    
      
        
    
          
  292. 
            
            

            

            
          
    293. 
        
    
      
        
    
          
  293. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    294. 
        
    
      
        
    
          
  294. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    295. 
        
    
      
        
    
          
  295. 
            2
            

            

                    click_on 'All'
          
    296. 
        
    
      
        
    
          
  296. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  end
          
    297. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  297. 
=======
          
  298. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  299. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  300. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  301. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  302. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  303. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  304. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    305. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  305. 
=======
          
  306. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  307. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  308. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  309. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  310. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  311. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  312. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  after do
          
    313. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  313. 
=======
          
  314. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  315. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  316. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  317. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  318. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  319. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  320. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.destroy
          
    321. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  321. 
=======
          
  322. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  323. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  324. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  325. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  326. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  327. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  328. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_two.destroy
          
    329. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  329. 
=======
          
  330. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  331. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  332. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  333. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  334. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  335. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  336. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    337. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  337. 
=======
          
  338. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  339. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  340. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  341. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  342. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  343. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  344. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    345. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  345. 
=======
          
  346. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  347. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  348. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  349. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  350. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  351. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  352. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'shown books for first category' do
          
    353. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  353. 
=======
          
  354. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  355. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  356. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  357. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  358. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  359. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  360. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    361. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  361. 
=======
          
  362. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  363. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  364. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  365. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  366. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  367. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  368. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    369. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  369. 
=======
          
  370. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  371. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  372. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  373. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  374. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  375. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  376. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    377. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  377. 
=======
          
  378. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  379. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  380. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  381. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  382. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  383. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  384. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'shown books for second category' do
          
    385. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  385. 
=======
          
  386. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  387. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  388. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  389. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  390. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  391. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  392. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
    393. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  393. 
            
            

            

                  end
          
    394. 
        
    
      
        
    
          
  394. 
            
            

            

                end
          
    395. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  395. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    396. 
        
    
      
        
    
          
  396. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    397. 
        
    
      
        
    
          
  397. 
            
            

            

              end
          
    398. 
        
    
      
        
    
          
  398. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    399. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  399. 
=======
          
  400. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  401. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  402. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  403. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  404. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  405. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  406. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'load_more' do
          
    407. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  407. 
=======
          
  408. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  409. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  410. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  411. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  412. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  413. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  414. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                before do
          
    415. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  415. 
=======
          
  416. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  417. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  418. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  419. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  420. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  421. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  422. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            3
            

            

<<<<<<< HEAD
                  24.times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    423. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  423. 
=======
          
  424. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  425. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  426. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  427. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  428. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  429. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  430. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            72
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    books << create(:book)
          
    431. 
        
    
      
        
    
          
  431. 
            
            

            

                  end
          
    432. 
        
    
      
        
    
          
  432. 
            
            

            

                end
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    433. 
        
    
      
        
    
          
  433. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    434. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  434. 
            4
=======
          
  435. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  436. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  437. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  438. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  439. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  440. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  441. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    442. 
        
    
      
        
    
          
  442. 
            
            

            

            
          
    443. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  443. 
            1
=======
          
  444. 
            4
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  445. 
            4
>>>>>>> 752f0c0 (Featire specs)
=======
          
  446. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  447. 
            4
>>>>>>> 08edf50 (Featire specs)
=======
          
  448. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  449. 
            4
>>>>>>> 7a02bbe (Featire specs)
=======
          
  450. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    451. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  451. 
            1
            

            

                  visit books_path
          
    452. 
        
    
      
        
    
          
  452. 
=======
          
  453. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  454. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  455. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  456. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  457. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  458. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  459. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    460. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  460. 
            1
            

            

                it 'show books without view more button' do
          
    461. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  461. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    462. 
        
    
      
        
    
          
  462. 
            
            

            

            
          
    463. 
        
    
      
        
    
          
  463. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    464. 
        
    
      
        
    
          
  464. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    465. 
        
    
      
        
    
          
  465. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
    466. 
        
    
      
        
    
          
  466. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    467. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  467. 
=======
          
  468. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  469. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  470. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  471. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  472. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  473. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  474. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    475. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  475. 
            1
            

            

                context 'when view more' do
          
    476. 
        
    
      
        
    
          
  476. 
            1
            

            

                  it 'show books with view more button' do
          
    477. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  477. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    478. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  478. 
            
=======
          
  479. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  480. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  481. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  482. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  483. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  484. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  485. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    486. 
        
    
      
        
    
          
  486. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    487. 
        
    
      
        
    
          
  487. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    488. 
        
    
      
        
    
          
  488. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
    489. 
        
    
      
        
    
          
  489. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  end
          
    490. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  490. 
=======
          
  491. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  492. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  493. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  494. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  495. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  496. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  497. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    498. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  498. 
=======
          
  499. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  500. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  501. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  502. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  503. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  504. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  505. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'show loaded books', js: true do
          
    506. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  506. 
            1
            

            

                    visit books_path
          
    507. 
        
    
      
        
    
          
  507. 
            
            

            

            
          
    508. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  508. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    509. 
        
    
      
        
    
          
  509. 
            
            

            

            
          
    510. 
        
    
      
        
    
          
  510. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    511. 
        
    
      
        
    
          
  511. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    512. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  512. 
            
=======
          
  513. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  514. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  515. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  516. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  517. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  518. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  519. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    520. 
        
    
      
        
    
          
  520. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    521. 
        
    
      
        
    
          
  521. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    522. 
        
    
      
        
    
          
  522. 
            
            

            

              end
          
    523. 
        
    
      
        
    
          
  523. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    524. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  524. 
=======
          
  525. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  526. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  527. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  528. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  529. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  530. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  531. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'sort' do
          
    532. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  532. 
=======
          
  533. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  534. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  535. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  536. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  537. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  538. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  539. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                shared_examples 'sort test' do
          
    540. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  540. 
=======
          
  541. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  542. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  543. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  544. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  545. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  546. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  547. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

                  it 'sort books' do
          
    548. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  548. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
    549. 
        
    
      
        
    
          
  549. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
    550. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  550. 
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    551. 
        
    
      
        
    
          
  551. 
            
            

            

<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    552. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  552. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  553. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
    554. 
        
    
      
        
    
          
  554. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    555. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  555. 
=======
          
  556. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  557. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  558. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  559. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  560. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  561. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  562. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

                    visit books_path
          
    563. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  563. 
=======
          
  564. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  565. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  566. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  567. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  568. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  569. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  570. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    571. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  571. 
=======
          
  572. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  573. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  574. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  575. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  576. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  577. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  578. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
    579. 
        
    
      
        
    
          
  579. 
            
            

            

                              id: 'menu').click
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    580. 
        
    
      
        
    
          
  580. 
            
            

            

            
          
    581. 
        
    
      
        
    
          
  581. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
    582. 
        
    
      
        
    
          
  582. 
            5
            

            

                      click_link button
          
    583. 
        
    
      
        
    
          
  583. 
            
            

            

                    end
          
    584. 
        
    
      
        
    
          
  584. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
    585. 
        
    
      
        
    
          
  585. 
            
            

            

                  end
          
    586. 
        
    
      
        
    
          
  586. 
            
            

            

                end
          
    587. 
        
    
      
        
    
          
  587. 
            
            

            

            
          
    588. 
        
    
      
        
    
          
  588. 
            1
            

            

                context 'when sort by title A to Z' do
          
    589. 
        
    
      
        
    
          
  589. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    590. 
        
    
      
        
    
          
  590. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    591. 
        
    
      
        
    
          
  591. 
            
            

            

            
          
    592. 
        
    
      
        
    
          
  592. 
            1
            

            

                  include_examples 'sort test'
          
    593. 
        
    
      
        
    
          
  593. 
            
            

            

                end
          
    594. 
        
    
      
        
    
          
  594. 
            
            

            

            
          
    595. 
        
    
      
        
    
          
  595. 
            1
            

            

                context 'when sort by title Z to A' do
          
    596. 
        
    
      
        
    
          
  596. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    597. 
        
    
      
        
    
          
  597. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    598. 
        
    
      
        
    
          
  598. 
            
            

            

            
          
    599. 
        
    
      
        
    
          
  599. 
            1
            

            

                  include_examples 'sort test'
          
    600. 
        
    
      
        
    
          
  600. 
            
            

            

                end
          
    601. 
        
    
      
        
    
          
  601. 
            
            

            

            
          
    602. 
        
    
      
        
    
          
  602. 
            1
            

            

                context 'when sort by price High to Low' do
          
    603. 
        
    
      
        
    
          
  603. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    604. 
        
    
      
        
    
          
  604. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    605. 
        
    
      
        
    
          
  605. 
            
            

            

            
          
    606. 
        
    
      
        
    
          
  606. 
            1
            

            

                  include_examples 'sort test'
          
    607. 
        
    
      
        
    
          
  607. 
            
            

            

                end
          
    608. 
        
    
      
        
    
          
  608. 
            
            

            

            
          
    609. 
        
    
      
        
    
          
  609. 
            1
            

            

                context 'when sort by price Low to High' do
          
    610. 
        
    
      
        
    
          
  610. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    611. 
        
    
      
        
    
          
  611. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    612. 
        
    
      
        
    
          
  612. 
            
            

            

            
          
    613. 
        
    
      
        
    
          
  613. 
            1
            

            

                  include_examples 'sort test'
          
    614. 
        
    
      
        
    
          
  614. 
            
            

            

                end
          
    615. 
        
    
      
        
    
          
  615. 
            
            

            

            
          
    616. 
        
    
      
        
    
          
  616. 
            1
            

            

                context 'when sort by newest' do
          
    617. 
        
    
      
        
    
          
  617. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    618. 
        
    
      
        
    
          
  618. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    619. 
        
    
      
        
    
          
  619. 
            
            

            

            
          
    620. 
        
    
      
        
    
          
  620. 
            1
            

            

                  include_examples 'sort test'
          
    621. 
        
    
      
        
    
          
  621. 
            
            

            

                end
          
    622. 
        
    
      
        
    
          
  622. 
            
            

            

              end
          
    623. 
        
    
      
        
    
          
  623. 
            
            

            

            end
          
    624.

spec/feature/cart_spec.rb

96.55% lines covered

29 relevant lines. 28 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
    4. 
        
    
      
        
    
          
  4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              before do
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                book
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                visit book_path(book.id)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              describe '#add_book_to_order' do
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'add book to order' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                    expect(page).to have_content(1)
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              describe '#quantity_change' do
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'book quantity inc' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit orders_path
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  sleep(2)
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                it 'book quantity dec' do
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                  visit orders_path
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                  end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  sleep(2)
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                it 'book quantity change' do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                  visit orders_path
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

              end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            end
          
    57.

spec/feature/coupon_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
    11. 
        
    
      
        
    
          
  11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              before do
          
    15. 
        
    
      
        
    
          
  15. 
            4
            

            

                sign_in(user)
          
    16. 
        
    
      
        
    
          
  16. 
            4
            

            

                order
          
    17. 
        
    
      
        
    
          
  17. 
            4
            

            

                order_book
          
    18. 
        
    
      
        
    
          
  18. 
            4
            

            

                visit orders_path
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              describe '#valid coupon' do
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                before do
          
    23. 
        
    
      
        
    
          
  23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                it 'sub price' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

                end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                it 'use coupon' do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                it 'count price with coupon' do
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#invalid coupon' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                it 'show error message' do
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            end
          
    51.

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 49 relevant lines. 49 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe 'Get Started' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                it 'on click move to catalog page' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  visit root_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  click_on 'Get Started'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe 'navbar' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                it 'on click home move to root-path' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  visit books_path
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  find('a', id: 'root').click
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  books_category
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  visit root_path
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  within('ul', id: 'nav') do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                context 'when guest' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  it 'on click login go to login page' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    visit root_path
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                    end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                  end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                    visit root_path
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                    end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                context 'when user', js: true do
          
    63. 
        
    
      
        
    
          
  63. 
            4
            

            

                  let(:user) { create(:user) }
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                  before do
          
    66. 
        
    
      
        
    
          
  66. 
            3
            

            

                    sign_in(user)
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                  it 'on click account show settings' do
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                    visit root_path
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    click_on I18n.t('header.account')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                  end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            
          
    77. 
        
    
      
        
    
          
  77. 
            1
            

            

                  it 'on click account show log_out' do
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                    visit root_path
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    click_on I18n.t('header.account')
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                  end
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

            
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

                  it 'log_out' do
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

                    visit root_path
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                    click_on I18n.t('header.account')
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

                  end
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

              end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            end
          
    97.

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#login' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  visit new_user_session_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully login' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'login' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                context 'when unsuccessfully login' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  it 'didn`t login' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            end
          
    36.

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              describe '#new_password' do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                it 'change password' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'not validate password' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  visit new_user_password_path
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  fill_in 'email', with: user.email
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#sing_up' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

                  visit new_user_registration_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully sing_up' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'sing_up users' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when users is already exits' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                  it 'sing_up users' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                    end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  it 'didn`t sing_up' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                    end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                  end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            end
          
    52.

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              before do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                sign_in(user)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                visit book_path(book)
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              shared_examples 'review' do
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                it 'review' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  find('i', id: rating).click
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            2
            

            

                  click_on I18n.t('review.post')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            2
            

            

                  expect(page).to have_content(result)
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              describe '#post review', js: true do
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                context 'when review posted' do
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  let(:title_words) { 3 }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  let(:body_words) { 5 }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                  include_examples 'review'
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when review not been posted' do
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  let(:title_words) { 80 }
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                  let(:body_words) { 30 }
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  include_examples 'review'
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            end
          
    47.

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              before do
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

                sign_in(user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                visit edit_user_path(user.id)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#email_change' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'change email' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  within('div', id: 'email') do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  user.confirm
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe '#password_change' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when error' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'didnt change password' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    within('div', id: 'password') do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                    end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    user.confirm
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successful' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'didnt change password' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    within('div', id: 'password') do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                    end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    user.confirm
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in shipping' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe '#sing_up' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                context 'when successfully sing_up' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  before do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                    visit new_user_registration_path
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  it 'sing_up user' do
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  it 'didn`t sing_up' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    visit new_user_registration_path
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                    end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#login' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                before do
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                  user_second.confirm
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successfully login' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'login' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    visit new_user_session_path
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                    end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

                  end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

            
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

                context 'when unsuccessfully login' do
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  it 'didn`t login' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                    visit new_user_session_path
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

                    end
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

                end
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

              end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            end
          
    77.

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AdminUser, type: :model do
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              context 'when validations' do
=======
              describe 'Get Started' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            2
=======
          
  6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  7. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  9. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  11. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:email) }
=======
                it 'on click move to catalog page' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  13. 
            2
=======
          
  14. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  15. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  16. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  17. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  18. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  19. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  20. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:password) }
=======
                  visit root_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit root_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                  click_on 'Get Started'
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
              end
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe 'navbar' do
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                let(:books_category) { FactoryBot.create(:books_category) }
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                it 'on click home move to root-path' do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  visit books_path
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                  find('a', id: 'root').click
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  books_category
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  visit root_path
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  within('ul', id: 'nav') do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                  end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

                end
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

              end
          
    54. 
        
    
      
        
    
          
  54. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            end
          
    55.

spec/models/author_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe Author, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            1
            

            

              describe 'author' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
=======
          
  8. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  9. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  10. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  11. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  13. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  14. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    15. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  15. 
=======
          
  16. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  17. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  18. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  19. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  20. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  21. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  22. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                context 'when associations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  23. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  24. 
            1
            

            

              describe 'author' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                context 'when validations' do
          
    26. 
        
    
      
        
    
          
  26. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
=======
          
  28. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  29. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  30. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  31. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  32. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  33. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  34. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  35. 
=======
          
  36. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  37. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  38. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  39. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  40. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  41. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  42. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    43. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  43. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                context 'when associations' do
          
    46. 
        
    
      
        
    
          
  46. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    47. 
        
    
      
        
    
          
  47. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                end
          
    49. 
        
    
      
        
    
          
  49. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    50. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  50. 
=======
          
  51. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  52. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  53. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  54. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  55. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  56. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  57. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            end
          
    58.

spec/models/authors_book_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            RSpec.describe AuthorsBook, type: :model do
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
=======
          
  5. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  6. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  7. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  8. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  9. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  10. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  11. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'authors_book' do
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  14. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  15. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  16. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  17. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  18. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  19. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when validations' do
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  20. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    21. 
        
    
      
        
    
          
  21. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                context 'when associations' do
          
    25. 
        
    
      
        
    
          
  25. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

              end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            end
          
    30.

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'billing' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
=======
          
  12. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  19. 
=======
          
  20. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  22. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  23. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  25. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
            1
            

            

                context 'when not validations' do
          
    28. 
        
    
      
        
    
          
  28. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when associations' do
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  49. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  50. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  51. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  52. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  53. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  54. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    55. 
        
    
      
        
    
          
  55. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    56. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  56. 
=======
          
  57. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  58. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  59. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  60. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  61. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  62. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  63. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    64. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  64. 
=======
          
  65. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  66. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  67. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  68. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  69. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  70. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  71. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            end
          
    72.

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            1
=======
          
  3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  5. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  6. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  8. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  9. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            RSpec.describe Book, type: :model do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              describe 'books' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                context 'when validations' do
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  13. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
    15. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  15. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:year_of_publication) }
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
    21. 
        
    
      
        
    
          
  21. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:dimensions) }
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  22. 
=======
          
  23. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  24. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  25. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  26. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  27. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  28. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  29. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
=======
          
  31. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  32. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  33. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  34. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  35. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  36. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  37. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    38. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  38. 
=======
          
  39. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  40. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  41. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  42. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  43. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  44. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  45. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when associations' do
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  46. 
=======
          
  47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  50. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    54. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  54. 
=======
          
  55. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  56. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  58. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  60. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  61. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
    62. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  62. 
=======
          
  63. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  64. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  65. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  66. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  67. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  68. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  69. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  70. 
=======
          
  71. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  72. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  73. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  74. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  75. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  76. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  77. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    78. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  78. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  80. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

                end
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

              end
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

            end
          
    84.

spec/models/books_category_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books_categories' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'category' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                context 'when associations' do
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.

spec/models/order_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Order, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'order' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when associations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to have_many(:order_books).dependent(:destroy) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:order_books) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Review, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'review' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:body) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                context 'when associations' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            end
          
    21.

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'shipping' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/user_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe User, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'author' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'with associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe BookQuery do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              shared_examples 'sort test' do
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                it 'sort' do
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                  books
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

                  expect(test).to eq(result)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            3
            

            

              let(:titles) { %w[Adam Zimbabwe] }
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              let(:books_dates) do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              describe 'all books sort' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context 'when sort by title A to Z' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                  let(:books) do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    create(:book, title: titles.first)
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    create(:book, title: titles.second)
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            2
            

            

                  let(:result) { titles.second }
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                  include_examples 'sort test'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                context 'when sort title Z to A' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                  let(:books) do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    create(:book, title: titles.first)
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    create(:book, title: titles.second)
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                  end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                  let(:result) { titles.first }
          
    36. 
        
    
      
        
    
          
  36. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  include_examples 'sort test'
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                context 'when sort by price High to Low' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                  let(:books) do
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                    create(:book, price_cents: 75)
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    create(:book, price_cents: 23)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                  end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            2
            

            

                  let(:result) { 75 }
          
    48. 
        
    
      
        
    
          
  48. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                  include_examples 'sort test'
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                context 'when sort price Low to High' do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                  let(:books) do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                    create(:book, price_cents: 75)
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    create(:book, price_cents: 23)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                  end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            2
            

            

                  let(:result) { 23 }
          
    60. 
        
    
      
        
    
          
  60. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  include_examples 'sort test'
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

                end
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                context 'when sort by Newest' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                  let(:books) do
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
    68. 
        
    
      
        
    
          
  68. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                  end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            2
            

            

                  let(:result) { books_dates.first }
          
    72. 
        
    
      
        
    
          
  72. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                  include_examples 'sort test'
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

              end
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            end
          
    78.

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Author' do
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  3. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
  4. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request authentication helper methods'
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
            Capybara.configure do |config|
>>>>>>> 94841b5 (Featire specs)
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
=======
          
  7. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  8. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request global before and after hooks'
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

              let(:old_name) { author.first_name }
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            4
            

            

              let(:author) { create(:author) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              before do
          
    19. 
        
    
      
        
    
          
  19. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              it 'can create an author' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                visit 'admin/authors'
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                click_link('New Author')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

              end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

              it 'can delete an author' do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                author
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                visit 'admin/authors'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              it 'can view an author' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                author
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                visit 'admin/authors'
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                click_link('View')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

              it 'can edit an author' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                author
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                visit 'admin/authors'
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                click_link('Edit')
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            7
            

            

              let(:book) { create(:book) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:params) do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                { title: FFaker::Book.title,
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  description: FFaker::Book.description,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  materials: 'Soft cover',
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              before do
          
    17. 
        
    
      
        
    
          
  17. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            6
            

            

                book
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            6
            

            

                visit 'admin/books'
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              it 'can create an book' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                click_link('New Book')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                click_button('Create Book')
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                expect(page).to have_content(params[:title])
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

              end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

              it 'can delete an book' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                click_link('Delete')
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

              end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              it 'can view an book' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                click_link('View')
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                expect(page).to have_content(book.title)
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

              it 'can edit an book' do
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                click_link('Edit')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                click_button('Update Book')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

                expect(page).to have_content('New title')
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

              end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

              context 'when image' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                before do
          
    64. 
        
    
      
        
    
          
  64. 
            2
            

            

                  click_link('Edit')
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

            
          
    66. 
        
    
      
        
    
          
  66. 
            2
            

            

                  page.attach_file('book[images][]', './spec/fixtures/Web-Book-Cover.png')
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

            
          
    68. 
        
    
      
        
    
          
  68. 
            2
            

            

                  click_on 'Update Book'
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

                it 'can add images to book' do
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            1
            

            

                it 'can delete images from book' do
          
    76. 
        
    
      
        
    
          
  76. 
            1
            

            

                  click_link('Edit')
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                  click_link('Delete')
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

                end
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

              end
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

            end
          
    84.

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Category' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:category) { create(:category) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              before do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                category
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                visit 'admin/categories'
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              it 'can create an category' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                click_link('New Category')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                fill_in 'category[name]', with: category_name
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                click_button('Create Category')
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                expect(page).to have_content(category_name)
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              it 'can delete an category' do
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                click_link('Delete')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                expect(page).not_to have_content(category.name)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

              end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

              it 'can view an category' do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                click_link('View')
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                expect(page).to have_content(category.name)
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

              end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

              it 'can edit an category' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                click_link('Edit')
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                fill_in 'category[name]', with: 'New Genre'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                click_button('Update Category')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                expect(page).to have_content('New Genre')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

              end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            end
          
    49.

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in billing' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            5
            

            

              let(:category_one) { create(:category) }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:category_two) { create(:category) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              let(:params) do
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                { title: FFaker::Book.title,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                  description: FFaker::Book.description,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  materials: 'Soft cover',
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#show book' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'show books info' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  visit "books/#{book.id}"
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'clicked Beck to results' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit "books/#{book.id}"
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when test read more' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'show read more' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    visit "books/#{book.id}"
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  it 'clicked read more', js: true do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    visit "books/#{book.id}"
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when quantity changes', js: true do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  before do
          
    48. 
        
    
      
        
    
          
  48. 
            2
            

            

                    visit "books/#{book.id}"
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            2
            

            

                    find('a', class: 'inc').click
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                  end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                  it 'increase quantity' do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                  end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                  it 'decrease quantity' do
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    find('a', class: 'dec').click
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

                    expect(page).to have_content("€#{book.price}")
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                  end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

                end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

              end
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
          
  64. 
            1
            

            

              describe '#catalog' do
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                describe 'filter by category' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                  before do
          
    67. 
        
    
      
        
    
          
  67. 
            2
            

            

                    category_one.books.create(params)
          
    68. 
        
    
      
        
    
          
  68. 
            2
            

            

                    visit books_path
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                  end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

                  after do
          
    72. 
        
    
      
        
    
          
  72. 
            2
            

            

                    category_one.destroy
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            1
            

            

                  it 'show book count for category' do
          
    76. 
        
    
      
        
    
          
  76. 
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

                  end
          
    78. 
        
    
      
        
    
          
  78. 
            
            

            

            
          
    79. 
        
    
      
        
    
          
  79. 
            1
            

            

                  it 'filter book by category' do
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    81. 
        
    
      
        
    
          
  81. 
            1
            

            

                      click_on category_one.name
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

                    end
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

            
          
    84. 
        
    
      
        
    
          
  84. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

                  end
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

                end
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                describe 'filter by all books' do
          
    89. 
        
    
      
        
    
          
  89. 
            1
            

            

                  before do
          
    90. 
        
    
      
        
    
          
  90. 
            2
            

            

                    category_one.books.create(params)
          
    91. 
        
    
      
        
    
          
  91. 
            2
            

            

                    category_two.books.create(params)
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

            
          
    93. 
        
    
      
        
    
          
  93. 
            2
            

            

                    visit books_path
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

            
          
    95. 
        
    
      
        
    
          
  95. 
            2
            

            

                    click_on I18n.t('catalog_page.all')
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

                  end
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

            
          
    98. 
        
    
      
        
    
          
  98. 
            1
            

            

                  after do
          
    99. 
        
    
      
        
    
          
  99. 
            2
            

            

                    category_one.destroy
          
    100. 
        
    
      
        
    
          
  100. 
            2
            

            

                    category_two.destroy
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                  end
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

            
          
    103. 
        
    
      
        
    
          
  103. 
            1
            

            

                  it 'shown books for first category' do
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    105. 
        
    
      
        
    
          
  105. 
            
            

            

                  end
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

            
          
    107. 
        
    
      
        
    
          
  107. 
            1
            

            

                  it 'shown books for second category' do
          
    108. 
        
    
      
        
    
          
  108. 
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

                  end
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

                end
          
    111. 
        
    
      
        
    
          
  111. 
            
            

            

              end
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

            
          
    113. 
        
    
      
        
    
          
  113. 
            1
            

            

              describe 'load_more' do
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

                before do
          
    115. 
        
    
      
        
    
          
  115. 
            3
            

            

                  24.times do
          
    116. 
        
    
      
        
    
          
  116. 
            72
            

            

                    books << create(:book)
          
    117. 
        
    
      
        
    
          
  117. 
            
            

            

                  end
          
    118. 
        
    
      
        
    
          
  118. 
            
            

            

                end
          
    119. 
        
    
      
        
    
          
  119. 
            
            

            

            
          
    120. 
        
    
      
        
    
          
  120. 
            4
            

            

                let(:books) { [] }
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

            
          
    122. 
        
    
      
        
    
          
  122. 
            1
            

            

                it 'show books without view more button' do
          
    123. 
        
    
      
        
    
          
  123. 
            1
            

            

                  visit books_path
          
    124. 
        
    
      
        
    
          
  124. 
            
            

            

            
          
    125. 
        
    
      
        
    
          
  125. 
            1
            

            

                  find('a', id: 'view_more', class: 'view_more').click
          
    126. 
        
    
      
        
    
          
  126. 
            
            

            

            
          
    127. 
        
    
      
        
    
          
  127. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
    128. 
        
    
      
        
    
          
  128. 
            
            

            

                end
          
    129. 
        
    
      
        
    
          
  129. 
            
            

            

            
          
    130. 
        
    
      
        
    
          
  130. 
            1
            

            

                context 'when view more' do
          
    131. 
        
    
      
        
    
          
  131. 
            1
            

            

                  it 'show books with view more button' do
          
    132. 
        
    
      
        
    
          
  132. 
            1
            

            

                    visit books_path
          
    133. 
        
    
      
        
    
          
  133. 
            
            

            

            
          
    134. 
        
    
      
        
    
          
  134. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
    135. 
        
    
      
        
    
          
  135. 
            
            

            

                  end
          
    136. 
        
    
      
        
    
          
  136. 
            
            

            

            
          
    137. 
        
    
      
        
    
          
  137. 
            1
            

            

                  it 'show loaded books', js: true do
          
    138. 
        
    
      
        
    
          
  138. 
            1
            

            

                    visit books_path
          
    139. 
        
    
      
        
    
          
  139. 
            
            

            

            
          
    140. 
        
    
      
        
    
          
  140. 
            1
            

            

                    find('a', class: 'view_more').click
          
    141. 
        
    
      
        
    
          
  141. 
            
            

            

            
          
    142. 
        
    
      
        
    
          
  142. 
            1
            

            

                    expect(page).to have_content(books.last.title)
          
    143. 
        
    
      
        
    
          
  143. 
            
            

            

                  end
          
    144. 
        
    
      
        
    
          
  144. 
            
            

            

                end
          
    145. 
        
    
      
        
    
          
  145. 
            
            

            

              end
          
    146. 
        
    
      
        
    
          
  146. 
            
            

            

            
          
    147. 
        
    
      
        
    
          
  147. 
            1
            

            

              describe 'sort' do
          
    148. 
        
    
      
        
    
          
  148. 
            1
            

            

                shared_examples 'sort test' do
          
    149. 
        
    
      
        
    
          
  149. 
            5
            

            

                  it 'sort books' do
          
    150. 
        
    
      
        
    
          
  150. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
    151. 
        
    
      
        
    
          
  151. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
    152. 
        
    
      
        
    
          
  152. 
            5
            

            

                    create(:book, title: 'Anna', price_cents: 23,
          
    153. 
        
    
      
        
    
          
  153. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
    154. 
        
    
      
        
    
          
  154. 
            
            

            

            
          
    155. 
        
    
      
        
    
          
  155. 
            5
            

            

                    visit books_path
          
    156. 
        
    
      
        
    
          
  156. 
            
            

            

            
          
    157. 
        
    
      
        
    
          
  157. 
            5
            

            

                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
    158. 
        
    
      
        
    
          
  158. 
            
            

            

                              id: 'menu').click
          
    159. 
        
    
      
        
    
          
  159. 
            
            

            

            
          
    160. 
        
    
      
        
    
          
  160. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
    161. 
        
    
      
        
    
          
  161. 
            5
            

            

                      click_link button
          
    162. 
        
    
      
        
    
          
  162. 
            
            

            

                    end
          
    163. 
        
    
      
        
    
          
  163. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
    164. 
        
    
      
        
    
          
  164. 
            
            

            

                  end
          
    165. 
        
    
      
        
    
          
  165. 
            
            

            

                end
          
    166. 
        
    
      
        
    
          
  166. 
            
            

            

            
          
    167. 
        
    
      
        
    
          
  167. 
            1
            

            

                context 'when sort by title A to Z' do
          
    168. 
        
    
      
        
    
          
  168. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
          
    169. 
        
    
      
        
    
          
  169. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    170. 
        
    
      
        
    
          
  170. 
            
            

            

            
          
    171. 
        
    
      
        
    
          
  171. 
            1
            

            

                  include_examples 'sort test'
          
    172. 
        
    
      
        
    
          
  172. 
            
            

            

                end
          
    173. 
        
    
      
        
    
          
  173. 
            
            

            

            
          
    174. 
        
    
      
        
    
          
  174. 
            1
            

            

                context 'when sort by title Z to A' do
          
    175. 
        
    
      
        
    
          
  175. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
          
    176. 
        
    
      
        
    
          
  176. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    177. 
        
    
      
        
    
          
  177. 
            
            

            

            
          
    178. 
        
    
      
        
    
          
  178. 
            1
            

            

                  include_examples 'sort test'
          
    179. 
        
    
      
        
    
          
  179. 
            
            

            

                end
          
    180. 
        
    
      
        
    
          
  180. 
            
            

            

            
          
    181. 
        
    
      
        
    
          
  181. 
            1
            

            

                context 'when sort by price High to Low' do
          
    182. 
        
    
      
        
    
          
  182. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
          
    183. 
        
    
      
        
    
          
  183. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    184. 
        
    
      
        
    
          
  184. 
            
            

            

            
          
    185. 
        
    
      
        
    
          
  185. 
            1
            

            

                  include_examples 'sort test'
          
    186. 
        
    
      
        
    
          
  186. 
            
            

            

                end
          
    187. 
        
    
      
        
    
          
  187. 
            
            

            

            
          
    188. 
        
    
      
        
    
          
  188. 
            1
            

            

                context 'when sort by price Low to High' do
          
    189. 
        
    
      
        
    
          
  189. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
          
    190. 
        
    
      
        
    
          
  190. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    191. 
        
    
      
        
    
          
  191. 
            
            

            

            
          
    192. 
        
    
      
        
    
          
  192. 
            1
            

            

                  include_examples 'sort test'
          
    193. 
        
    
      
        
    
          
  193. 
            
            

            

                end
          
    194. 
        
    
      
        
    
          
  194. 
            
            

            

            
          
    195. 
        
    
      
        
    
          
  195. 
            1
            

            

                context 'when sort by newest' do
          
    196. 
        
    
      
        
    
          
  196. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
          
    197. 
        
    
      
        
    
          
  197. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    198. 
        
    
      
        
    
          
  198. 
            
            

            

            
          
    199. 
        
    
      
        
    
          
  199. 
            1
            

            

                  include_examples 'sort test'
          
    200. 
        
    
      
        
    
          
  200. 
            
            

            

                end
          
    201. 
        
    
      
        
    
          
  201. 
            
            

            

              end
          
    202. 
        
    
      
        
    
          
  202. 
            
            

            

            end
          
    203.

spec/feature/cart_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
    4. 
        
    
      
        
    
          
  4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              before do
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                book
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                visit book_path(book.id)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              describe '#add_book_to_order' do
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'add book to order' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                    expect(page).to have_content(1)
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              describe '#quantity_change' do
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'book quantity inc' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit orders_path
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  sleep(2)
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                it 'book quantity dec' do
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                  visit orders_path
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                  end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  sleep(2)
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                it 'remove book from cart' do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                  visit orders_path
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

              end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            end
          
    57.

spec/feature/checkout_spec.rb

100.0% lines covered

36 relevant lines. 36 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'Checkout', type: :feature, js: true do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

              let(:user) { create(:user) }
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              describe '#logedis user' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                it 'on click checkout render address page' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  sign_in(user)
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                  visit root_path
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  find('a.shop-link.pull-right.hidden-xs').click
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                  find('input.btn.btn-default.mb-20.hidden-xs.center-block').click
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                  expect(page).to have_content('Checkout')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              describe '#guest' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                before do
          
    24. 
        
    
      
        
    
          
  24. 
            3
            

            

                  visit root_path
          
    25. 
        
    
      
        
    
          
  25. 
            3
            

            

                  find('a.shop-link.pull-right.hidden-xs').click
          
    26. 
        
    
      
        
    
          
  26. 
            3
            

            

                  find('input.btn.btn-default.mb-20.hidden-xs.center-block').click
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                context 'when has an account' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                  it 'continue using account' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    within('form#login') do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                      fill_in :user_email, with: user.email
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      fill_in :user_password, with: user.password
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                      click_on I18n.t('checkout.log_in_with_password')
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                    end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_in'))
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                  end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                context 'when dont have an account' do
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  it 'fast registration' do
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    within('form#fast_reg') do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                      fill_in :user_email, with: 'test@rspec.com'
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                      click_on I18n.t('checkout.continue')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

                    end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                    expect(page).to have_content('Checkout')
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

                  end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                  it 'email is already taken' do
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                    within('form#fast_reg') do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                      fill_in :user_email, with: user.email
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                      click_on I18n.t('checkout.continue')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                    end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('checkout.error_message'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/coupon_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
    11. 
        
    
      
        
    
          
  11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              before do
          
    15. 
        
    
      
        
    
          
  15. 
            4
            

            

                sign_in(user)
          
    16. 
        
    
      
        
    
          
  16. 
            4
            

            

                order
          
    17. 
        
    
      
        
    
          
  17. 
            4
            

            

                order_book
          
    18. 
        
    
      
        
    
          
  18. 
            4
            

            

                visit orders_path
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              describe '#valid coupon' do
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                before do
          
    23. 
        
    
      
        
    
          
  23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                it 'sub price' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

                end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                it 'use coupon' do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                it 'count price with coupon' do
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#invalid coupon' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                it 'show error message' do
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            end
          
    51.

spec/feature/home_spec.rb

100.0% lines covered

49 relevant lines. 49 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe 'Get Started' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                it 'on click move to catalog page' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  visit root_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  click_on 'Get Started'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe 'navbar' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                it 'on click home move to root-path' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  visit books_path
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  find('a', id: 'root').click
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  books_category
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  visit root_path
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  within('ul', id: 'nav') do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                context 'when guest' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  it 'on click login go to login page' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    visit root_path
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                    end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                  end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                    visit root_path
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                    end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                context 'when user', js: true do
          
    63. 
        
    
      
        
    
          
  63. 
            4
            

            

                  let(:user) { create(:user) }
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                  before do
          
    66. 
        
    
      
        
    
          
  66. 
            3
            

            

                    sign_in(user)
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                  it 'on click account show settings' do
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                    visit root_path
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    click_on I18n.t('header.account')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                  end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            
          
    77. 
        
    
      
        
    
          
  77. 
            1
            

            

                  it 'on click account show log_out' do
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                    visit root_path
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    click_on I18n.t('header.account')
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                  end
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

            
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

                  it 'log_out' do
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

                    visit root_path
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                    click_on I18n.t('header.account')
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

                  end
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

              end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            end
          
    97.

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#login' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  visit new_user_session_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully login' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'login' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                context 'when unsuccessfully login' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  it 'didn`t login' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            end
          
    36.

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              describe '#new_password' do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                it 'change password' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'not validate password' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  visit new_user_password_path
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  fill_in 'email', with: user.email
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#sing_up' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

                  visit new_user_registration_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully sing_up' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'sing_up users' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when users is already exits' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                  it 'sing_up users' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                    end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  it 'didn`t sing_up' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                    end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                  end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            end
          
    52.

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              before do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                sign_in(user)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                visit book_path(book)
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              shared_examples 'review' do
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                it 'review' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  find('i', id: rating).click
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            2
            

            

                  click_on I18n.t('review.post')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            2
            

            

                  expect(page).to have_content(result)
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              describe '#post review', js: true do
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                context 'when review posted' do
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  let(:title_words) { 3 }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  let(:body_words) { 5 }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                  include_examples 'review'
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when review not been posted' do
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  let(:title_words) { 80 }
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                  let(:body_words) { 30 }
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  include_examples 'review'
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            end
          
    47.

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              before do
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

                sign_in(user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                visit edit_user_path(user.id)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#email_change' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'change email' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  within('div', id: 'email') do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  user.confirm
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe '#password_change' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when error' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'didnt change password' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    within('div', id: 'password') do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                    end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    user.confirm
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successful' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'didnt change password' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    within('div', id: 'password') do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                    end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    user.confirm
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in shipping' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe '#sing_up' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                context 'when successfully sing_up' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  before do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                    visit new_user_registration_path
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  it 'sing_up user' do
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  it 'didn`t sing_up' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    visit new_user_registration_path
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                    end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#login' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                before do
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                  user_second.confirm
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successfully login' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'login' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    visit new_user_session_path
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                    end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

                  end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

            
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

                context 'when unsuccessfully login' do
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  it 'didn`t login' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                    visit new_user_session_path
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

                    end
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

                end
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

              end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            end
          
    77.

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AdminUser, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              context 'when validations' do
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                it { is_expected.to validate_presence_of(:email) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                it { is_expected.to validate_presence_of(:password) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Author, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'author' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe AuthorsBook, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'authors_book' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'billing' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Book, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:year_of_publication) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:quantity) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to validate_presence_of(:dimensions) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when associations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            end
          
    24.

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books_categories' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'category' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                context 'when associations' do
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.

spec/models/order_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Order, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'order' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when associations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to have_many(:order_books).dependent(:destroy) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:order_books) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe Review, type: :model do
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe 'review' do
=======
              describe 'books_categories' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:title) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:body) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                context 'when associations' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            end
          
    21.

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'shipping' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe User, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'author' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                context 'with associations' do
=======
                context 'when associations' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_one(:billing) }
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_one(:shipping) }
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

spec/queryes/book_query_spec.rb

=======

spec/models/category_spec.rb

>>>>>>> d0dc1f1 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 752f0c0 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 08edf50 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> 7a02bbe (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe BookQuery do
=======
            RSpec.describe Category, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              shared_examples 'sort test' do
=======
              describe 'category' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'category' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            5
=======
          
  6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  7. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  9. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  11. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'sort' do
=======
                context 'when validations' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  13. 
            5
=======
          
  14. 
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  15. 
            2
>>>>>>> 752f0c0 (Featire specs)
=======
          
  16. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  17. 
            2
>>>>>>> 08edf50 (Featire specs)
=======
          
  18. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  19. 
            2
>>>>>>> 7a02bbe (Featire specs)
=======
          
  20. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  books
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    21. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  21. 
            5
            

            

                  expect(test).to eq(result)
          
    22. 
        
    
      
        
    
          
  22. 
=======
          
  23. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  24. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  25. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  26. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  27. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  28. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  29. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                context 'when associations' do
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  37. 
            
            

            

            end
          
    38.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages)

spec/models/user_spec.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe User, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              pending "add some examples to (or delete) #{__FILE__}"
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            end
          
    6.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)

spec/rails_helper.rb

87.5% lines covered

16 relevant lines. 14 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'spec_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            ENV['RAILS_ENV'] ||= 'test'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            require_relative '../config/environment'
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            abort('The Rails environment is running in production mode!') if Rails.env.production?
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

            require 'rspec/rails'
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

            require 'shoulda-matchers'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

            require_relative 'support/configs/shoulda_matcher'
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

            require_relative 'support/configs/capybara'
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  11. 
            3
=======
          
  12. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  13. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  16. 
            
>>>>>>> 7a02bbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:titles) { %w[Adam Zimbabwe] }
=======
            begin
>>>>>>> d0dc1f1 (Featire specs)
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
=======
            begin
>>>>>>> 4e81ea2 (Featire specs)
=======
            begin
>>>>>>> 08edf50 (Featire specs)
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:books_dates) do
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> d0dc1f1 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4e81ea2 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
          
    18. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  18. 
            1
=======
          
  19. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  20. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  21. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  22. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  23. 
            
>>>>>>> 7a02bbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> d0dc1f1 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4e81ea2 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
          
    24. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  24. 
=======
          
  25. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  26. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  27. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  28. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  29. 
>>>>>>> 7a02bbe (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              puts e.to_s.strip
>>>>>>> d0dc1f1 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 4e81ea2 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
  31. 
            
            

            

              exit 1
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            end
          
    33. 
        
    
      
        
    
          
  33. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
            
            

            

            
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  34. 
            1
            

            

              describe 'all books sort' do
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                context 'when sort by title A to Z' do
          
    36. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
  36. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:books) do
=======
            RSpec.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: titles.first)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: titles.second)
=======
              config.use_transactional_fixtures = true
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
          
    39. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  39. 
            
            

            

                  end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                  let(:result) { titles.second }
          
    42. 
        
    
      
        
    
          
  42. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
=======
          
  45. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  46. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  47. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  48. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  49. 
>>>>>>> 7a02bbe (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  include_examples 'sort test'
=======
              config.infer_spec_type_from_file_location!
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
          
    50. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  50. 
            
            

            

                end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
=======
          
  53. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  54. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  55. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  56. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  57. 
>>>>>>> 7a02bbe (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                context 'when sort title Z to A' do
=======
              config.filter_rails_from_backtrace!
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  58. 
            1
            

            

                  let(:books) do
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

                    create(:book, title: titles.first)
          
    60. 
        
    
      
        
    
          
  60. 
            1
            

            

                    create(:book, title: titles.second)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

                  end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            
          
    63. 
        
    
      
        
    
          
  63. 
            2
            

            

                  let(:result) { titles.first }
          
    64. 
        
    
      
        
    
          
  64. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

            
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                  include_examples 'sort test'
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                context 'when sort by price High to Low' do
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                  let(:books) do
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

                    create(:book, price_cents: 75)
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    create(:book, price_cents: 23)
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            2
            

            

                  let(:result) { 75 }
          
    76. 
        
    
      
        
    
          
  76. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                  include_examples 'sort test'
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

                end
          
    80. 
        
    
      
        
    
          
  80. 
            
            

            

            
          
    81. 
        
    
      
        
    
          
  81. 
            1
            

            

                context 'when sort price Low to High' do
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                  let(:books) do
          
    83. 
        
    
      
        
    
          
  83. 
            1
            

            

                    create(:book, price_cents: 75)
          
    84. 
        
    
      
        
    
          
  84. 
            1
            

            

                    create(:book, price_cents: 23)
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

                  end
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

            
          
    87. 
        
    
      
        
    
          
  87. 
            2
            

            

                  let(:result) { 23 }
          
    88. 
        
    
      
        
    
          
  88. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                  include_examples 'sort test'
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

                end
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

            
          
    93. 
        
    
      
        
    
          
  93. 
            1
            

            

                context 'when sort by Newest' do
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

                  let(:books) do
          
    95. 
        
    
      
        
    
          
  95. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
    96. 
        
    
      
        
    
          
  96. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

                  end
          
    98. 
        
    
      
        
    
          
  98. 
            
            

            

            
          
    99. 
        
    
      
        
    
          
  99. 
            2
            

            

                  let(:result) { books_dates.first }
          
    100. 
        
    
      
        
    
          
  100. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

            
          
    102. 
        
    
      
        
    
          
  102. 
            1
            

            

                  include_examples 'sort test'
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

                end
          
    104. 
        
    
      
        
    
          
  104. 
            
            

            

              end
          
    105. 
        
    
      
        
    
          
  105. 
=======
          
  106. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  107. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  108. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  109. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  110. 
>>>>>>> 7a02bbe (Featire specs)
            
            

            

            end
          
    111.

spec/support/configs/capybara.rb

<<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> c033601 (Rebased) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 4e7b845 (Manifest_cache true) ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Author' do
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  3. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
  4. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request authentication helper methods'
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
            Capybara.configure do |config|
>>>>>>> 94841b5 (Featire specs)
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
=======
          
  7. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  8. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request global before and after hooks'
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

              let(:old_name) { author.first_name }
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            4
            

            

              let(:author) { create(:author) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              before do
          
    19. 
        
    
      
        
    
          
  19. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              it 'can create an author' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                visit 'admin/authors'
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                click_link('New Author')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

              end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

              it 'can delete an author' do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                author
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                visit 'admin/authors'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              it 'can view an author' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                author
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                visit 'admin/authors'
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                click_link('View')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

              it 'can edit an author' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                author
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                visit 'admin/authors'
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                click_link('Edit')
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            7
            

            

              let(:book) { create(:book) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:params) do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                { title: FFaker::Book.title,
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  description: FFaker::Book.description,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                  materials: 'Soft cover',
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              before do
          
    17. 
        
    
      
        
    
          
  17. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            6
            

            

                book
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            6
            

            

                visit 'admin/books'
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              it 'can create an book' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                click_link('New Book')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                click_button('Create Book')
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                expect(page).to have_content(params[:title])
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

              end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

              it 'can delete an book' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                click_link('Delete')
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

              end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              it 'can view an book' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                click_link('View')
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                expect(page).to have_content(book.title)
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

              it 'can edit an book' do
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                click_link('Edit')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                click_button('Update Book')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

                expect(page).to have_content('New title')
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

              end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

              context 'when image' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                before do
          
    64. 
        
    
      
        
    
          
  64. 
            2
            

            

                  click_link('Edit')
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

            
          
    66. 
        
    
      
        
    
          
  66. 
            2
            

            

                  page.attach_file('book[images][]', './spec/fixtures/Web-Book-Cover.png')
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

            
          
    68. 
        
    
      
        
    
          
  68. 
            2
            

            

                  click_on 'Update Book'
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

                it 'can add images to book' do
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            1
            

            

                it 'can delete images from book' do
          
    76. 
        
    
      
        
    
          
  76. 
            1
            

            

                  click_link('Edit')
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                  click_link('Delete')
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

                end
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

              end
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

            end
          
    84.

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Category' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:category) { create(:category) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              before do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                category
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                visit 'admin/categories'
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              it 'can create an category' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                click_link('New Category')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                fill_in 'category[name]', with: category_name
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                click_button('Create Category')
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                expect(page).to have_content(category_name)
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              it 'can delete an category' do
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                click_link('Delete')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                expect(page).not_to have_content(category.name)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

              end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

              it 'can view an category' do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                click_link('View')
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                expect(page).to have_content(category.name)
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

              end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

              it 'can edit an category' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                click_link('Edit')
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                fill_in 'category[name]', with: 'New Genre'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                click_button('Update Category')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                expect(page).to have_content('New Genre')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

              end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            end
          
    49.

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in billing' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            5
            

            

              let(:category_one) { create(:category) }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:category_two) { create(:category) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              let(:params) do
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                { title: FFaker::Book.title,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                  description: FFaker::Book.description,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  materials: 'Soft cover',
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#show book' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'show books info' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  visit "books/#{book.id}"
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'clicked Beck to results' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit "books/#{book.id}"
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when test read more' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'show read more' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    visit "books/#{book.id}"
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  it 'clicked read more', js: true do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    visit "books/#{book.id}"
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when quantity changes', js: true do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  before do
          
    48. 
        
    
      
        
    
          
  48. 
            2
            

            

                    visit "books/#{book.id}"
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            2
            

            

                    find('a', class: 'inc').click
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                  end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                  it 'increase quantity' do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                  end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                  it 'decrease quantity' do
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    find('a', class: 'dec').click
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

                    expect(page).to have_content("€#{book.price}")
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                  end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

                end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

              end
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
          
  64. 
            1
            

            

              describe '#catalog' do
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                describe 'filter by category' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                  before do
          
    67. 
        
    
      
        
    
          
  67. 
            2
            

            

                    category_one.books.create(params)
          
    68. 
        
    
      
        
    
          
  68. 
            2
            

            

                    visit books_path
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                  end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            1
            

            

                  after do
          
    72. 
        
    
      
        
    
          
  72. 
            2
            

            

                    category_one.destroy
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            1
            

            

                  it 'show book count for category' do
          
    76. 
        
    
      
        
    
          
  76. 
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

                  end
          
    78. 
        
    
      
        
    
          
  78. 
            
            

            

            
          
    79. 
        
    
      
        
    
          
  79. 
            1
            

            

                  it 'filter book by category' do
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    81. 
        
    
      
        
    
          
  81. 
            1
            

            

                      click_on category_one.name
          
    82. 
        
    
      
        
    
          
  82. 
            
            

            

                    end
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

            
          
    84. 
        
    
      
        
    
          
  84. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    85. 
        
    
      
        
    
          
  85. 
            
            

            

                  end
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

                end
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                describe 'filter by all books' do
          
    89. 
        
    
      
        
    
          
  89. 
            1
            

            

                  before do
          
    90. 
        
    
      
        
    
          
  90. 
            2
            

            

                    category_one.books.create(params)
          
    91. 
        
    
      
        
    
          
  91. 
            2
            

            

                    category_two.books.create(params)
          
    92. 
        
    
      
        
    
          
  92. 
            
            

            

            
          
    93. 
        
    
      
        
    
          
  93. 
            2
            

            

                    visit books_path
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

            
          
    95. 
        
    
      
        
    
          
  95. 
            2
            

            

                    click_on I18n.t('catalog_page.all')
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

                  end
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

            
          
    98. 
        
    
      
        
    
          
  98. 
            1
            

            

                  after do
          
    99. 
        
    
      
        
    
          
  99. 
            2
            

            

                    category_one.destroy
          
    100. 
        
    
      
        
    
          
  100. 
            2
            

            

                    category_two.destroy
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

                  end
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

            
          
    103. 
        
    
      
        
    
          
  103. 
            1
            

            

                  it 'shown books for first category' do
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    105. 
        
    
      
        
    
          
  105. 
            
            

            

                  end
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

            
          
    107. 
        
    
      
        
    
          
  107. 
            1
            

            

                  it 'shown books for second category' do
          
    108. 
        
    
      
        
    
          
  108. 
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

                  end
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

                end
          
    111. 
        
    
      
        
    
          
  111. 
            
            

            

              end
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

            
          
    113. 
        
    
      
        
    
          
  113. 
            1
            

            

              describe 'load_more' do
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

                before do
          
    115. 
        
    
      
        
    
          
  115. 
            3
            

            

                  24.times do
          
    116. 
        
    
      
        
    
          
  116. 
            72
            

            

                    books << create(:book)
          
    117. 
        
    
      
        
    
          
  117. 
            
            

            

                  end
          
    118. 
        
    
      
        
    
          
  118. 
            
            

            

                end
          
    119. 
        
    
      
        
    
          
  119. 
            
            

            

            
          
    120. 
        
    
      
        
    
          
  120. 
            4
            

            

                let(:books) { [] }
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

            
          
    122. 
        
    
      
        
    
          
  122. 
            1
            

            

                it 'show books without view more button' do
          
    123. 
        
    
      
        
    
          
  123. 
            1
            

            

                  visit books_path
          
    124. 
        
    
      
        
    
          
  124. 
            
            

            

            
          
    125. 
        
    
      
        
    
          
  125. 
            1
            

            

                  find('a', id: 'view_more', class: 'view_more').click
          
    126. 
        
    
      
        
    
          
  126. 
            
            

            

            
          
    127. 
        
    
      
        
    
          
  127. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
    128. 
        
    
      
        
    
          
  128. 
            
            

            

                end
          
    129. 
        
    
      
        
    
          
  129. 
            
            

            

            
          
    130. 
        
    
      
        
    
          
  130. 
            1
            

            

                context 'when view more' do
          
    131. 
        
    
      
        
    
          
  131. 
            1
            

            

                  it 'show books with view more button' do
          
    132. 
        
    
      
        
    
          
  132. 
            1
            

            

                    visit books_path
          
    133. 
        
    
      
        
    
          
  133. 
            
            

            

            
          
    134. 
        
    
      
        
    
          
  134. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
    135. 
        
    
      
        
    
          
  135. 
            
            

            

                  end
          
    136. 
        
    
      
        
    
          
  136. 
            
            

            

            
          
    137. 
        
    
      
        
    
          
  137. 
            1
            

            

                  it 'show loaded books', js: true do
          
    138. 
        
    
      
        
    
          
  138. 
            1
            

            

                    visit books_path
          
    139. 
        
    
      
        
    
          
  139. 
            
            

            

            
          
    140. 
        
    
      
        
    
          
  140. 
            1
            

            

                    find('a', class: 'view_more').click
          
    141. 
        
    
      
        
    
          
  141. 
            
            

            

            
          
    142. 
        
    
      
        
    
          
  142. 
            1
            

            

                    expect(page).to have_content(books.last.title)
          
    143. 
        
    
      
        
    
          
  143. 
            
            

            

                  end
          
    144. 
        
    
      
        
    
          
  144. 
            
            

            

                end
          
    145. 
        
    
      
        
    
          
  145. 
            
            

            

              end
          
    146. 
        
    
      
        
    
          
  146. 
            
            

            

            
          
    147. 
        
    
      
        
    
          
  147. 
            1
            

            

              describe 'sort' do
          
    148. 
        
    
      
        
    
          
  148. 
            1
            

            

                shared_examples 'sort test' do
          
    149. 
        
    
      
        
    
          
  149. 
            5
            

            

                  it 'sort books' do
          
    150. 
        
    
      
        
    
          
  150. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
    151. 
        
    
      
        
    
          
  151. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
    152. 
        
    
      
        
    
          
  152. 
            5
            

            

                    create(:book, title: 'Anna', price_cents: 23,
          
    153. 
        
    
      
        
    
          
  153. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
    154. 
        
    
      
        
    
          
  154. 
            
            

            

            
          
    155. 
        
    
      
        
    
          
  155. 
            5
            

            

                    visit books_path
          
    156. 
        
    
      
        
    
          
  156. 
            
            

            

            
          
    157. 
        
    
      
        
    
          
  157. 
            5
            

            

                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
    158. 
        
    
      
        
    
          
  158. 
            
            

            

                              id: 'menu').click
          
    159. 
        
    
      
        
    
          
  159. 
            
            

            

            
          
    160. 
        
    
      
        
    
          
  160. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
    161. 
        
    
      
        
    
          
  161. 
            5
            

            

                      click_link button
          
    162. 
        
    
      
        
    
          
  162. 
            
            

            

                    end
          
    163. 
        
    
      
        
    
          
  163. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
    164. 
        
    
      
        
    
          
  164. 
            
            

            

                  end
          
    165. 
        
    
      
        
    
          
  165. 
            
            

            

                end
          
    166. 
        
    
      
        
    
          
  166. 
            
            

            

            
          
    167. 
        
    
      
        
    
          
  167. 
            1
            

            

                context 'when sort by title A to Z' do
          
    168. 
        
    
      
        
    
          
  168. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
          
    169. 
        
    
      
        
    
          
  169. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    170. 
        
    
      
        
    
          
  170. 
            
            

            

            
          
    171. 
        
    
      
        
    
          
  171. 
            1
            

            

                  include_examples 'sort test'
          
    172. 
        
    
      
        
    
          
  172. 
            
            

            

                end
          
    173. 
        
    
      
        
    
          
  173. 
            
            

            

            
          
    174. 
        
    
      
        
    
          
  174. 
            1
            

            

                context 'when sort by title Z to A' do
          
    175. 
        
    
      
        
    
          
  175. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
          
    176. 
        
    
      
        
    
          
  176. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    177. 
        
    
      
        
    
          
  177. 
            
            

            

            
          
    178. 
        
    
      
        
    
          
  178. 
            1
            

            

                  include_examples 'sort test'
          
    179. 
        
    
      
        
    
          
  179. 
            
            

            

                end
          
    180. 
        
    
      
        
    
          
  180. 
            
            

            

            
          
    181. 
        
    
      
        
    
          
  181. 
            1
            

            

                context 'when sort by price High to Low' do
          
    182. 
        
    
      
        
    
          
  182. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
          
    183. 
        
    
      
        
    
          
  183. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    184. 
        
    
      
        
    
          
  184. 
            
            

            

            
          
    185. 
        
    
      
        
    
          
  185. 
            1
            

            

                  include_examples 'sort test'
          
    186. 
        
    
      
        
    
          
  186. 
            
            

            

                end
          
    187. 
        
    
      
        
    
          
  187. 
            
            

            

            
          
    188. 
        
    
      
        
    
          
  188. 
            1
            

            

                context 'when sort by price Low to High' do
          
    189. 
        
    
      
        
    
          
  189. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
          
    190. 
        
    
      
        
    
          
  190. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    191. 
        
    
      
        
    
          
  191. 
            
            

            

            
          
    192. 
        
    
      
        
    
          
  192. 
            1
            

            

                  include_examples 'sort test'
          
    193. 
        
    
      
        
    
          
  193. 
            
            

            

                end
          
    194. 
        
    
      
        
    
          
  194. 
            
            

            

            
          
    195. 
        
    
      
        
    
          
  195. 
            1
            

            

                context 'when sort by newest' do
          
    196. 
        
    
      
        
    
          
  196. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
          
    197. 
        
    
      
        
    
          
  197. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    198. 
        
    
      
        
    
          
  198. 
            
            

            

            
          
    199. 
        
    
      
        
    
          
  199. 
            1
            

            

                  include_examples 'sort test'
          
    200. 
        
    
      
        
    
          
  200. 
            
            

            

                end
          
    201. 
        
    
      
        
    
          
  201. 
            
            

            

              end
          
    202. 
        
    
      
        
    
          
  202. 
            
            

            

            end
          
    203.

spec/feature/cart_spec.rb

100.0% lines covered

26 relevant lines. 26 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
    2. 
        
    
      
        
    
          
  2. 
            5
            

            

              let(:book) { create(:book) }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              before do
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                book
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                visit book_path(book.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                find('a.shop-link.pull-right.hidden-xs').click
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

              describe '#add_book_to_order' do
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'add book to order' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  within('a.shop-link.pull-right.hidden-xs') do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                    expect(page).to have_content(1)
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              describe '#quantity_change' do
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'book quantity inc' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                  end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  sleep(2)
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

                end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                it 'book quantity dec' do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  sleep(2)
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

              describe '#remove_book_from_cart' do
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                it 'remove book from cart' do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                  find('button.close.general-cart-close').click
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            end
          
    51.

spec/feature/checkout_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Checkout', type: :feature, js: true do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              describe '#loggedin user' do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                it 'on click checkout render address page' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  sign_in(user)
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  visit root_path
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  find('a.shop-link.pull-right.hidden-xs').click
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                  find('a#checkout_button.btn.btn-default.hidden-xs').click
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  expect(page).to have_content('Checkout')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              describe '#guest' do
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                before do
          
    21. 
        
    
      
        
    
          
  21. 
            3
            

            

                  visit root_path
          
    22. 
        
    
      
        
    
          
  22. 
            3
            

            

                  find('a.shop-link.pull-right.hidden-xs').click
          
    23. 
        
    
      
        
    
          
  23. 
            3
            

            

                  find('input.btn.btn-default.mb-20.hidden-xs.center-block').click
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                context 'when has an account' do
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  it 'continue using account' do
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                    within('form#login') do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                      fill_in :user_email, with: user.email
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      fill_in :user_password, with: user.password
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                      click_on I18n.t('checkout.log_in_with_password')
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                    end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_in'))
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                  end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                context 'when dont have an account' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                  it 'fast registration' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                    within('form#fast_reg') do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                      fill_in :user_email, with: 'test@rspec.com'
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                      click_on I18n.t('checkout.continue')
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                    end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                    expect(page).to have_content('Checkout')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

                  end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                  it 'email is already taken' do
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                    within('form#fast_reg') do
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in :user_email, with: user.email
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                      click_on I18n.t('checkout.continue')
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

                    end
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                    expect(page).to have_content(I18n.t('checkout.error_message'))
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                  end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

              end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            end
          
    60.

spec/feature/coupon_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

              let(:coupon) { create(:coupon, discount: 0.15) }
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:order) { create(:order, user_id: user.id, books_count: 0) }
          
    8. 
        
    
      
        
    
          
  8. 
            5
            

            

              let(:book) { create(:book, price_cents: 1234) }
          
    9. 
        
    
      
        
    
          
  9. 
            5
            

            

              let(:order_book) { create(:order_book, order: order, book: book) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              before do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                sign_in(user)
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                order
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                order_book
          
    15. 
        
    
      
        
    
          
  15. 
            4
            

            

                visit order_path(order.id)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              describe '#valid coupon' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                before do
          
    20. 
        
    
      
        
    
          
  20. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            3
            

            

                  click_button I18n.t('order.apply')
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                it 'sub price' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                it 'use coupon' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                it 'count price with coupon' do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

              end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

              describe '#invalid coupon' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                it 'show error message' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                  click_button I18n.t('order.apply')
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

              end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            end
          
    48.

spec/feature/home_spec.rb

100.0% lines covered

49 relevant lines. 49 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe 'Get Started' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                it 'on click move to catalog page' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  visit root_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  click_on 'Get Started'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe 'navbar' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                it 'on click home move to root-path' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  visit books_path
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  find('a', id: 'root').click
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  books_category
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  visit root_path
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  within('ul', id: 'nav') do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                context 'when guest' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  it 'on click login go to login page' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    visit root_path
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                    end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                  end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                    visit root_path
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                    end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                context 'when user', js: true do
          
    63. 
        
    
      
        
    
          
  63. 
            4
            

            

                  let(:user) { create(:user) }
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                  before do
          
    66. 
        
    
      
        
    
          
  66. 
            3
            

            

                    sign_in(user)
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                  it 'on click account show settings' do
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                    visit root_path
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    click_on I18n.t('header.account')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                  end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            
          
    77. 
        
    
      
        
    
          
  77. 
            1
            

            

                  it 'on click account show log_out' do
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                    visit root_path
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    click_on I18n.t('header.account')
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                  end
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

            
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

                  it 'log_out' do
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

                    visit root_path
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                    click_on I18n.t('header.account')
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

                  end
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

              end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            end
          
    97.

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#login' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  visit new_user_session_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully login' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'login' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                context 'when unsuccessfully login' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  it 'didn`t login' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            end
          
    36.

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              describe '#new_password' do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                it 'change password' do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                it 'not validate password' do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  visit new_user_password_path
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  fill_in 'email', with: user.email
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

              end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            end
          
    25.

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#sing_up' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

                  visit new_user_registration_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully sing_up' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'sing_up users' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when users is already exits' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                  it 'sing_up users' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                    end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  it 'didn`t sing_up' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                    end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                  end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            end
          
    52.

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              before do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                sign_in(user)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                visit book_path(book)
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              shared_examples 'review' do
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                it 'review' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  find('i', id: rating).click
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            2
            

            

                  click_on I18n.t('review.post')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            2
            

            

                  expect(page).to have_content(result)
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

              end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

              describe '#post review', js: true do
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                context 'when review posted' do
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  let(:title_words) { 3 }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  let(:body_words) { 5 }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                  include_examples 'review'
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when review not been posted' do
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  let(:title_words) { 80 }
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                  let(:body_words) { 30 }
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  include_examples 'review'
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

              end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            end
          
    47.

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              before do
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

                sign_in(user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                visit edit_user_path(user.id)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#email_change' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'change email' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  within('div', id: 'email') do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  user.confirm
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe '#password_change' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when error' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'didnt change password' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    within('div', id: 'password') do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                    end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    user.confirm
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successful' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'didnt change password' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    within('div', id: 'password') do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                    end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    user.confirm
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in shipping' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe '#sing_up' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                context 'when successfully sing_up' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  before do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                    visit new_user_registration_path
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  it 'sing_up user' do
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  it 'didn`t sing_up' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    visit new_user_registration_path
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                    end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#login' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                before do
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                  user_second.confirm
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successfully login' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'login' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    visit new_user_session_path
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                    end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

                  end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

            
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

                context 'when unsuccessfully login' do
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  it 'didn`t login' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                    visit new_user_session_path
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

                    end
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

                end
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

              end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            end
          
    77.

spec/models/address_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Address, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'address' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe AdminUser, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              context 'when validations' do
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                it { is_expected.to validate_presence_of(:email) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                it { is_expected.to validate_presence_of(:password) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            end
          
    9.

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Author, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'author' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe AuthorsBook, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'authors_book' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Book, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:year_of_publication) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:quantity) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to validate_presence_of(:dimensions) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when associations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            end
          
    24.

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books_categories' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'category' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                context 'when associations' do
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.

spec/models/credit_card_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe CreditCard, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              context 'when validations' do
          
    3. 
        
    
      
        
    
          
  3. 
            2
            

            

                it { is_expected.to allow_values('a' * Constants::CARD_NAME_MAX_LENGTH).for(:name) }
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                it { is_expected.to allow_values('4149499809038407', '4149499115747899').for(:code) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                it { is_expected.to allow_values('342', '123', '423', '093').for(:cvv) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                it { is_expected.to allow_values('12/42', '01/23', '07/22', '08/99').for(:expiration_date) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              context 'when not validations' do
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                it { is_expected.not_to allow_values('a' * Constants::CARD_NAME_MAX_LENGTH.next).for(:name) }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                it { is_expected.not_to allow_values('3018--dwq12348979-1853').for(:code) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                it { is_expected.not_to allow_values('1234', 'eqwr').for(:cvv) }
          
    13. 
        
    
      
        
    
          
  13. 
            2
            

            

                it { is_expected.not_to allow_values('14/32', '00/217').for(:expiration_date) }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              context 'when associations' do
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                it { is_expected.to belong_to(:user) }
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.

spec/models/delivery_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Delivery, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              context 'when validations' do
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                it { is_expected.to validate_presence_of(:delivery_method) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                it { is_expected.to have_many(:orders).dependent(:nullify) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            end
          
    12.

spec/models/order_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Order, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'order' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when associations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to have_many(:order_books).dependent(:destroy) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:order_books) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            end
          
    11.

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe Review, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'review' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:body) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                context 'when associations' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            end
          
    21.

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe User, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'author' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                context 'with associations' do
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe BookQuery do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              shared_examples 'sort test' do
          
    5. 
        
    
      
        
    
          
  5. 
            5
            

            

                it 'sort' do
          
    6. 
        
    
      
        
    
          
  6. 
            5
            

            

                  books
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

                  expect(test).to eq(result)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

              end
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            3
            

            

              let(:titles) { %w[Adam Zimbabwe] }
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              let(:books_dates) do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              describe 'all books sort' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                context 'when sort by title A to Z' do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                  let(:books) do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    create(:book, title: titles.first)
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    create(:book, title: titles.second)
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            2
            

            

                  let(:result) { titles.second }
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                  include_examples 'sort test'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                context 'when sort title Z to A' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                  let(:books) do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    create(:book, title: titles.first)
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    create(:book, title: titles.second)
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                  end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                  let(:result) { titles.first }
          
    36. 
        
    
      
        
    
          
  36. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  include_examples 'sort test'
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                context 'when sort by price High to Low' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                  let(:books) do
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                    create(:book, price_cents: 75)
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    create(:book, price_cents: 23)
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                  end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            2
            

            

                  let(:result) { 75 }
          
    48. 
        
    
      
        
    
          
  48. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                  include_examples 'sort test'
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

                end
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                context 'when sort price Low to High' do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                  let(:books) do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                    create(:book, price_cents: 75)
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    create(:book, price_cents: 23)
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

                  end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

            
          
    59. 
        
    
      
        
    
          
  59. 
            2
            

            

                  let(:result) { 23 }
          
    60. 
        
    
      
        
    
          
  60. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  include_examples 'sort test'
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

                end
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                context 'when sort by Newest' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                  let(:books) do
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
    68. 
        
    
      
        
    
          
  68. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

                  end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            
          
    71. 
        
    
      
        
    
          
  71. 
            2
            

            

                  let(:result) { books_dates.first }
          
    72. 
        
    
      
        
    
          
  72. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                  include_examples 'sort test'
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

              end
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

            end
          
    78.

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 4e7b845 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Author' do
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  3. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
  4. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request authentication helper methods'
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
            Capybara.configure do |config|
>>>>>>> 94841b5 (Featire specs)
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  6. 
=======
          
  7. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  8. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request global before and after hooks'
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

              let(:old_name) { author.first_name }
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            4
            

            

              let(:author) { create(:author) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              before do
          
    19. 
        
    
      
        
    
          
  19. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

              it 'can create an author' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                visit 'admin/authors'
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                click_link('New Author')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

              end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

              it 'can delete an author' do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                author
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                visit 'admin/authors'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              it 'can view an author' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                author
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                visit 'admin/authors'
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                click_link('View')
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

              it 'can edit an author' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                author
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                visit 'admin/authors'
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                click_link('Edit')
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Book' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
=======
          
  6. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  7. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  8. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  9. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  10. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  11. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  12. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book) }
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
              let(:category_one) { FactoryBot.create(:category) }
          
    13. 
        
    
      
        
    
          
  13. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              let(:params) do
          
    15. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  15. 
            1
=======
          
  16. 
            4
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  17. 
            4
>>>>>>> 752f0c0 (Featire specs)
=======
          
  18. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  19. 
            4
>>>>>>> 08edf50 (Featire specs)
=======
          
  20. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  21. 
            4
>>>>>>> 7a02bbe (Featire specs)
=======
          
  22. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

                { title: FFaker::Book.title,
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                  description: FFaker::Book.description,
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  materials: 'Soft cover',
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              before do
          
    32. 
        
    
      
        
    
          
  32. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            4
            

            

                book
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            4
            

            

                visit 'admin/books'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

              end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

              it 'can create an category' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                click_link('New Book')
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                click_button('Create Book')
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                expect(page).to have_content(params[:title])
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

              end
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

              it 'can delete an book' do
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                click_link('Delete')
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

              end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

            
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

              it 'can view an book' do
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                click_link('View')
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
          
  64. 
            1
            

            

                expect(page).to have_content(book.title)
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

              end
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

            
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

              it 'can edit an book' do
          
    68. 
        
    
      
        
    
          
  68. 
            1
            

            

                click_link('Edit')
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

            
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                click_button('Update Book')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                expect(page).to have_content('New title')
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

              end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            end
          
    77.

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Category' do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            5
            

            

              let(:category) { create(:category) }
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              before do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                category
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            4
            

            

                visit 'admin/categories'
          
    15. 
        
    
      
        
    
          
  15. 
            
=======
          
  16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  17. 
            7
>>>>>>> 752f0c0 (Featire specs)
=======
          
  18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  19. 
            7
>>>>>>> 08edf50 (Featire specs)
=======
          
  20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  21. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  27. 
            1
            

            

                  visit "books/#{book.id}"
          
    28. 
        
    
      
        
    
          
  28. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
=======
          
  30. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  31. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  32. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  33. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  34. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  35. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  36. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                click_button('Create Category')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            
=======
          
  49. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  50. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  51. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  52. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  53. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  54. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  55. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  58. 
            1
            

            

                click_link('Delete')
          
    59. 
        
    
      
        
    
          
  59. 
=======
          
  60. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  61. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  62. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  63. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  64. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  66. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
=======
          
  68. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  69. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  70. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  71. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  72. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  73. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  74. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
>>>>>>> 1cb2e82 (Featire specs)
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
            
=======
          
  78. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  79. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  80. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  81. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  82. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  83. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  84. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

            
          
    91. 
        
    
      
        
    
          
  91. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

            
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

            
          
    96. 
        
    
      
        
    
          
  96. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  98. 
            1
=======
          
  99. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  100. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  101. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  102. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  103. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  104. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  105. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
    107. 
        
    
      
        
    
          
  107. 
            
            

            

            end
          
    108.

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            2
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in billing' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            5
            

            

              let(:category_one) { create(:category) }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:category_two) { create(:category) }
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              let(:params) do
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                { title: FFaker::Book.title,
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                  description: FFaker::Book.description,
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                  materials: 'Soft cover',
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#show book' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'show books info' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  visit "books/#{book.id}"
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                it 'clicked Beck to results' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  visit "books/#{book.id}"
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when test read more' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'show read more' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    visit "books/#{book.id}"
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  it 'clicked read more', js: true do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                    visit "books/#{book.id}"
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    click_link 'Read More'
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
=======
          
  47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  50. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when quantity changes', js: true do
          
    54. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  54. 
=======
          
  55. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  56. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  58. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  60. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  61. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  before do
          
    62. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  62. 
            2
            

            

                    visit "books/#{book.id}"
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  64. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
            1
=======
          
  68. 
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  69. 
            2
>>>>>>> 752f0c0 (Featire specs)
=======
          
  70. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  71. 
            2
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  72. 
            2
            

            

                    find('a', class: 'inc').click
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

            
          
    75. 
        
    
      
        
    
          
  75. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
=======
          
  77. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  78. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  79. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
    80. 
        
    
      
        
    
          
  80. 
=======
          
  81. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  82. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  83. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  84. 
>>>>>>> 08edf50 (Featire specs)
            
            

            

                  end
          
    85. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  85. 
=======
          
  86. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  87. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  88. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  89. 
>>>>>>> 08edf50 (Featire specs)
            
            

            

            
          
    90. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  90. 
=======
          
  91. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  92. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  93. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  94. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
          
    95. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  95. 
=======
          
  96. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  97. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  98. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  99. 
>>>>>>> 08edf50 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

                  end
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    102. 
        
    
      
        
    
          
  102. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    103. 
        
    
      
        
    
          
  103. 
            1
            

            

                    find('a', class: 'dec').click
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price}")
          
    105. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  105. 
            
            

            

                  end
          
    106. 
        
    
      
        
    
          
  106. 
            
            

            

                end
          
    107. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  107. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

              end
          
    110. 
        
    
      
        
    
          
  110. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    111. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  111. 
            1
            

            

              describe '#catalog' do
          
    112. 
        
    
      
        
    
          
  112. 
            1
            

            

                describe 'filter by category' do
          
    113. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  113. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
              describe '#catalog' do
          
    114. 
        
    
      
        
    
          
  114. 
            1
            

            

                describe 'filter by category' do
          
    115. 
        
    
      
        
    
          
  115. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  before do
          
    116. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  116. 
=======
          
  117. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  118. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  119. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  120. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  121. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  122. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  123. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.books.create(params)
          
    124. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  124. 
=======
          
  125. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  126. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  127. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  128. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  129. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  130. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  131. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    visit books_path
          
    132. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  132. 
=======
          
  133. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  134. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  135. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  136. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  137. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  138. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  139. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    140. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  140. 
=======
          
  141. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  142. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  143. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  144. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  145. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  146. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  147. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    148. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  148. 
=======
          
  149. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  150. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  151. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  152. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  153. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  154. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  155. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  after do
          
    156. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  156. 
=======
          
  157. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  158. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  159. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  160. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  161. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  162. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  163. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.destroy
          
    164. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  164. 
=======
          
  165. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  166. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  167. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  168. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  169. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  170. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  171. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    172. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  172. 
=======
          
  173. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  174. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  175. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  176. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  177. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  178. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  179. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    180. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  180. 
=======
          
  181. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  182. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  183. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  184. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  185. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  186. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  187. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'show book count for category' do
          
    188. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  188. 
=======
          
  189. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  190. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  191. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  192. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  193. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  194. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  195. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
    196. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  196. 
=======
          
  197. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  198. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  199. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  200. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  201. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  202. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  203. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    204. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  204. 
=======
          
  205. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  206. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  207. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  208. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  209. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  210. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  211. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    212. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  212. 
            1
            

            

                  it 'filter book by category' do
          
    213. 
        
    
      
        
    
          
  213. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    214. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  214. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  it 'filter book by category' do
          
    215. 
        
    
      
        
    
          
  215. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
    216. 
        
    
      
        
    
          
  216. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                      click_on category_one.name
          
    217. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  217. 
=======
          
  218. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  219. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  220. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  221. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  222. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  223. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  224. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                    end
          
    225. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  225. 
=======
          
  226. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  227. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  228. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  229. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  230. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  231. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  232. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    233. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  233. 
=======
          
  234. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  235. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  236. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  237. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  238. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  239. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  240. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    241. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  241. 
=======
          
  242. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  243. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  244. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  245. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  246. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  247. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  248. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    249. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  249. 
=======
          
  250. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  251. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  252. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  253. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  254. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  255. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  256. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    257. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  257. 
=======
          
  258. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  259. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  260. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  261. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  262. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  263. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  264. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    265. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  265. 
=======
          
  266. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  267. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  268. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  269. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  270. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  271. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  272. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                describe 'filter by all books' do
          
    273. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  273. 
=======
          
  274. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  275. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  276. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  277. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  278. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  279. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  280. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  before do
          
    281. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  281. 
=======
          
  282. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  283. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  284. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  285. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  286. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  287. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  288. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.books.create(params)
          
    289. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  289. 
            2
            

            

                    category_two.books.create(params)
          
    290. 
        
    
      
        
    
          
  290. 
            
            

            

            
          
    291. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  291. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    292. 
        
    
      
        
    
          
  292. 
            
            

            

            
          
    293. 
        
    
      
        
    
          
  293. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    294. 
        
    
      
        
    
          
  294. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    295. 
        
    
      
        
    
          
  295. 
            2
            

            

                    click_on 'All'
          
    296. 
        
    
      
        
    
          
  296. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  end
          
    297. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  297. 
=======
          
  298. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  299. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  300. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  301. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  302. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  303. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  304. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    305. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  305. 
=======
          
  306. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  307. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  308. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  309. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  310. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  311. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  312. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  after do
          
    313. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  313. 
=======
          
  314. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  315. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  316. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  317. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  318. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  319. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  320. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_one.destroy
          
    321. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  321. 
=======
          
  322. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  323. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  324. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  325. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  326. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  327. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  328. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

                    category_two.destroy
          
    329. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  329. 
=======
          
  330. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  331. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  332. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  333. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  334. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  335. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  336. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    337. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  337. 
=======
          
  338. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  339. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  340. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  341. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  342. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  343. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  344. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    345. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  345. 
=======
          
  346. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  347. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  348. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  349. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  350. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  351. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  352. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'shown books for first category' do
          
    353. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  353. 
=======
          
  354. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  355. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  356. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  357. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  358. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  359. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  360. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
    361. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  361. 
=======
          
  362. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  363. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  364. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  365. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  366. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  367. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  368. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                  end
          
    369. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  369. 
=======
          
  370. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  371. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  372. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  373. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  374. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  375. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  376. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    377. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  377. 
=======
          
  378. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  379. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  380. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  381. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  382. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  383. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  384. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'shown books for second category' do
          
    385. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  385. 
=======
          
  386. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  387. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  388. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  389. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  390. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  391. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  392. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
    393. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  393. 
            
            

            

                  end
          
    394. 
        
    
      
        
    
          
  394. 
            
            

            

                end
          
    395. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  395. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    396. 
        
    
      
        
    
          
  396. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    397. 
        
    
      
        
    
          
  397. 
            
            

            

              end
          
    398. 
        
    
      
        
    
          
  398. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    399. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  399. 
=======
          
  400. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  401. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  402. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  403. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  404. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  405. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  406. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'load_more' do
          
    407. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  407. 
=======
          
  408. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  409. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  410. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  411. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  412. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  413. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  414. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                before do
          
    415. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  415. 
=======
          
  416. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  417. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  418. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  419. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  420. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  421. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  422. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  24.times do
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
                  24.times do
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
          
    423. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  423. 
=======
          
  424. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  425. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  426. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  427. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  428. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  429. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  430. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            72
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    books << create(:book)
          
    431. 
        
    
      
        
    
          
  431. 
            
            

            

                  end
          
    432. 
        
    
      
        
    
          
  432. 
            
            

            

                end
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    433. 
        
    
      
        
    
          
  433. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    434. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  434. 
            4
=======
          
  435. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  436. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  437. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  438. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  439. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  440. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  441. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    442. 
        
    
      
        
    
          
  442. 
            
            

            

            
          
    443. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  443. 
            1
=======
          
  444. 
            4
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  445. 
            4
>>>>>>> 752f0c0 (Featire specs)
=======
          
  446. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  447. 
            4
>>>>>>> 08edf50 (Featire specs)
=======
          
  448. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  449. 
            4
>>>>>>> 7a02bbe (Featire specs)
=======
          
  450. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    451. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  451. 
            1
            

            

                  visit books_path
          
    452. 
        
    
      
        
    
          
  452. 
=======
          
  453. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  454. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  455. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  456. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  457. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  458. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  459. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    460. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  460. 
            1
            

            

                it 'show books without view more button' do
          
    461. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  461. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    462. 
        
    
      
        
    
          
  462. 
            
            

            

            
          
    463. 
        
    
      
        
    
          
  463. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    464. 
        
    
      
        
    
          
  464. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    465. 
        
    
      
        
    
          
  465. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
    466. 
        
    
      
        
    
          
  466. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    467. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  467. 
=======
          
  468. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  469. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  470. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  471. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  472. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  473. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  474. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    475. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  475. 
            1
            

            

                context 'when view more' do
          
    476. 
        
    
      
        
    
          
  476. 
            1
            

            

                  it 'show books with view more button' do
          
    477. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  477. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    478. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  478. 
            
=======
          
  479. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  480. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  481. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  482. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  483. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  484. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  485. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    486. 
        
    
      
        
    
          
  486. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    487. 
        
    
      
        
    
          
  487. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    488. 
        
    
      
        
    
          
  488. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
    489. 
        
    
      
        
    
          
  489. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  end
          
    490. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  490. 
=======
          
  491. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  492. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  493. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  494. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  495. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  496. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  497. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    498. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  498. 
=======
          
  499. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  500. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  501. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  502. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  503. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  504. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  505. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                  it 'show loaded books', js: true do
          
    506. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  506. 
            1
            

            

                    visit books_path
          
    507. 
        
    
      
        
    
          
  507. 
            
            

            

            
          
    508. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  508. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    509. 
        
    
      
        
    
          
  509. 
            
            

            

            
          
    510. 
        
    
      
        
    
          
  510. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    511. 
        
    
      
        
    
          
  511. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    512. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  512. 
            
=======
          
  513. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  514. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  515. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  516. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  517. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  518. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  519. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    520. 
        
    
      
        
    
          
  520. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    521. 
        
    
      
        
    
          
  521. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                end
          
    522. 
        
    
      
        
    
          
  522. 
            
            

            

              end
          
    523. 
        
    
      
        
    
          
  523. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
          
    524. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  524. 
=======
          
  525. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  526. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  527. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  528. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  529. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  530. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  531. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'sort' do
          
    532. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  532. 
=======
          
  533. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  534. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  535. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  536. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  537. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  538. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  539. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                shared_examples 'sort test' do
          
    540. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  540. 
=======
          
  541. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  542. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  543. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  544. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  545. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  546. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  547. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

                  it 'sort books' do
          
    548. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  548. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
    549. 
        
    
      
        
    
          
  549. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
    550. 
        
    
      
        
    
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  550. 
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    551. 
        
    
      
        
    
          
  551. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
=======
>>>>>>> d780a52 (Rebased)
=======
>>>>>>> 83979de (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 12bcf81 (Featire specs)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
          
    552. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  552. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  553. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
    554. 
        
    
      
        
    
          
  554. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    555. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  555. 
=======
          
  556. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  557. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  558. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  559. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  560. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  561. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  562. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

                    visit books_path
          
    563. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  563. 
=======
          
  564. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  565. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  566. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  567. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  568. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  569. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  570. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    571. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  571. 
=======
          
  572. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  573. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  574. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  575. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  576. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  577. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  578. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
    579. 
        
    
      
        
    
          
  579. 
            
            

            

                              id: 'menu').click
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    580. 
        
    
      
        
    
          
  580. 
            
            

            

            
          
    581. 
        
    
      
        
    
          
  581. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
    582. 
        
    
      
        
    
          
  582. 
            5
            

            

                      click_link button
          
    583. 
        
    
      
        
    
          
  583. 
            
            

            

                    end
          
    584. 
        
    
      
        
    
          
  584. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
    585. 
        
    
      
        
    
          
  585. 
            
            

            

                  end
          
    586. 
        
    
      
        
    
          
  586. 
            
            

            

                end
          
    587. 
        
    
      
        
    
          
  587. 
            
            

            

            
          
    588. 
        
    
      
        
    
          
  588. 
            1
            

            

                context 'when sort by title A to Z' do
          
    589. 
        
    
      
        
    
          
  589. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    590. 
        
    
      
        
    
          
  590. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    591. 
        
    
      
        
    
          
  591. 
            
            

            

            
          
    592. 
        
    
      
        
    
          
  592. 
            1
            

            

                  include_examples 'sort test'
          
    593. 
        
    
      
        
    
          
  593. 
            
            

            

                end
          
    594. 
        
    
      
        
    
          
  594. 
            
            

            

            
          
    595. 
        
    
      
        
    
          
  595. 
            1
            

            

                context 'when sort by title Z to A' do
          
    596. 
        
    
      
        
    
          
  596. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    597. 
        
    
      
        
    
          
  597. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    598. 
        
    
      
        
    
          
  598. 
            
            

            

            
          
    599. 
        
    
      
        
    
          
  599. 
            1
            

            

                  include_examples 'sort test'
          
    600. 
        
    
      
        
    
          
  600. 
            
            

            

                end
          
    601. 
        
    
      
        
    
          
  601. 
            
            

            

            
          
    602. 
        
    
      
        
    
          
  602. 
            1
            

            

                context 'when sort by price High to Low' do
          
    603. 
        
    
      
        
    
          
  603. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    604. 
        
    
      
        
    
          
  604. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    605. 
        
    
      
        
    
          
  605. 
            
            

            

            
          
    606. 
        
    
      
        
    
          
  606. 
            1
            

            

                  include_examples 'sort test'
          
    607. 
        
    
      
        
    
          
  607. 
            
            

            

                end
          
    608. 
        
    
      
        
    
          
  608. 
            
            

            

            
          
    609. 
        
    
      
        
    
          
  609. 
            1
            

            

                context 'when sort by price Low to High' do
          
    610. 
        
    
      
        
    
          
  610. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    611. 
        
    
      
        
    
          
  611. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
    612. 
        
    
      
        
    
          
  612. 
            
            

            

            
          
    613. 
        
    
      
        
    
          
  613. 
            1
            

            

                  include_examples 'sort test'
          
    614. 
        
    
      
        
    
          
  614. 
            
            

            

                end
          
    615. 
        
    
      
        
    
          
  615. 
            
            

            

            
          
    616. 
        
    
      
        
    
          
  616. 
            1
            

            

                context 'when sort by newest' do
          
    617. 
        
    
      
        
    
          
  617. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    618. 
        
    
      
        
    
          
  618. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
    619. 
        
    
      
        
    
          
  619. 
            
            

            

            
          
    620. 
        
    
      
        
    
          
  620. 
            1
            

            

                  include_examples 'sort test'
          
    621. 
        
    
      
        
    
          
  621. 
            
            

            

                end
          
    622. 
        
    
      
        
    
          
  622. 
            
            

            

              end
          
    623. 
        
    
      
        
    
          
  623. 
            
            

            

            end
          
    624.

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 49 relevant lines. 49 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe 'Get Started' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                it 'on click move to catalog page' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  visit root_path
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                  click_on 'Get Started'
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe 'navbar' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                it 'on click home move to root-path' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  visit books_path
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  find('a', id: 'root').click
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                  books_category
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                  visit root_path
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                  within('ul', id: 'nav') do
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                context 'when guest' do
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  it 'on click login go to login page' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    visit root_path
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

                    end
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

            
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                  end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                    visit root_path
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
    55. 
        
    
      
        
    
          
  55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

                    end
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                context 'when user', js: true do
          
    63. 
        
    
      
        
    
          
  63. 
            4
            

            

                  let(:user) { create(:user) }
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                  before do
          
    66. 
        
    
      
        
    
          
  66. 
            3
            

            

                    sign_in(user)
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

                  end
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                  it 'on click account show settings' do
          
    70. 
        
    
      
        
    
          
  70. 
            1
            

            

                    visit root_path
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    click_on I18n.t('header.account')
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
          
  74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

                  end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            
          
    77. 
        
    
      
        
    
          
  77. 
            1
            

            

                  it 'on click account show log_out' do
          
    78. 
        
    
      
        
    
          
  78. 
            1
            

            

                    visit root_path
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
            1
            

            

                    click_on I18n.t('header.account')
          
    81. 
        
    
      
        
    
          
  81. 
            
            

            

            
          
    82. 
        
    
      
        
    
          
  82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
    83. 
        
    
      
        
    
          
  83. 
            
            

            

                  end
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

            
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

                  it 'log_out' do
          
    86. 
        
    
      
        
    
          
  86. 
            1
            

            

                    visit root_path
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

            
          
    88. 
        
    
      
        
    
          
  88. 
            1
            

            

                    click_on I18n.t('header.account')
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

            
          
    90. 
        
    
      
        
    
          
  90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
    91. 
        
    
      
        
    
          
  91. 
            
            

            

            
          
    92. 
        
    
      
        
    
          
  92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
    93. 
        
    
      
        
    
          
  93. 
            
            

            

                  end
          
    94. 
        
    
      
        
    
          
  94. 
            
            

            

                end
          
    95. 
        
    
      
        
    
          
  95. 
            
            

            

              end
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

            end
          
    97.

spec/feature/login_spec.rb

100.0% lines covered

19 relevant lines. 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e3b70 (Fix) ======= 19 lines covered and 0 lines missed. >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
            RSpec.describe 'Login', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#login' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  visit new_user_session_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully login' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'login' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                  end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

                context 'when unsuccessfully login' do
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  it 'didn`t login' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                  end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                end
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

              end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            end
          
    36.

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../rails_helper'
=======
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5f76842 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ea0650c (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a038b16 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d7fadcd (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  3. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  4. 
>>>>>>> 998f08d (Manifest_cache true)
=======
=======
          
  5. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  6. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
            require_relative '../support/shared_context'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
    9. 
        
    
      
        
    
          
  9. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              describe '#new_password' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                it 'change password' do
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                it 'not validate password' do
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  visit new_user_password_path
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                  fill_in 'email', with: user.email
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            end
          
    29.

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe '#sing_up' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                before do
          
    6. 
        
    
      
        
    
          
  6. 
            3
            

            

                  visit new_user_registration_path
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                context 'when successfully sing_up' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  it 'sing_up users' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when users is already exits' do
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                  it 'sing_up users' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                    end
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                  end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                  it 'didn`t sing_up' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

                    end
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                  end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

                end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

              end
          
    51. 
        
    
      
        
    
          
  51. 
            
            

            

            end
          
    52.

spec/feature/review_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../support/shared_context'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

              let(:user) { FactoryBot.create(:user).decorate }
          
    9. 
        
    
      
        
    
          
  9. 
            3
            

            

              let(:book) { FactoryBot.create(:book).decorate }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              before do
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                sign_in(user)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                visit book_path(book)
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

              end
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              shared_examples 'review' do
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                it 'review' do
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  find('i', id: rating).click
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
    22. 
        
    
      
        
    
          
  22. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  click_on I18n.t('review.post')
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                  expect(page).to have_content(result)
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

              end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

            
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

              describe '#post review', js: true do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                context 'when review posted' do
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                  let(:title_words) { 5 }
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                  let(:body_words) { 10 }
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                  let(:result) { user.name_or_email }
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                  include_examples 'review'
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                context 'when review not been posted' do
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
    42. 
        
    
      
        
    
          
  42. 
            2
            

            

                  let(:title_words) { 80 }
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                  let(:body_words) { 30 }
          
    44. 
        
    
      
        
    
          
  44. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                  include_examples 'review'
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

                end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

              end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            end
          
    50.

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

              let(:user) { create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              before do
          
    8. 
        
    
      
        
    
          
  8. 
            3
            

            

                sign_in(user)
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                visit edit_user_path(user.id)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              describe '#email_change' do
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

                it 'change email' do
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

                  within('div', id: 'email') do
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                  user.confirm
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

            
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

              end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe '#password_change' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                context 'when error' do
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                  it 'didnt change password' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                    within('div', id: 'password') do
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    34. 
        
    
      
        
    
          
  34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                    end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

                    user.confirm
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

                  end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successful' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'didnt change password' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    within('div', id: 'password') do
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                    end
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

            
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                    user.confirm
          
    57. 
        
    
      
        
    
          
  57. 
            
            

            

            
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                  end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

                end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              describe '#fill_in', js: true do
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                it 'fill in shipping' do
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  sign_in(user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                  visit edit_user_path(user.id)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                    end
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                    end
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                    end
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                    end
          
    27. 
        
    
      
        
    
          
  27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                    end
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                    end
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                    end
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

                end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

              end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            end
          
    43.

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
    2. 
        
    
      
        
    
          
  2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
    3. 
        
    
      
        
    
          
  3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              describe '#sing_up' do
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

                context 'when successfully sing_up' do
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                  before do
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                    visit new_user_registration_path
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

                  it 'sing_up user' do
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

                  it 'didn`t sing_up' do
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

                    visit new_user_registration_path
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                    end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  end
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              describe '#login' do
          
    42. 
        
    
      
        
    
          
  42. 
            1
            

            

                before do
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                  user_second.confirm
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                context 'when successfully login' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  it 'login' do
          
    48. 
        
    
      
        
    
          
  48. 
            1
            

            

                    visit new_user_session_path
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            
          
    50. 
        
    
      
        
    
          
  50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    52. 
        
    
      
        
    
          
  52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                    end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

                  end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

                end
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

            
          
    61. 
        
    
      
        
    
          
  61. 
            1
            

            

                context 'when unsuccessfully login' do
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

                  it 'didn`t login' do
          
    63. 
        
    
      
        
    
          
  63. 
            1
            

            

                    visit new_user_session_path
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
    67. 
        
    
      
        
    
          
  67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

            
          
    69. 
        
    
      
        
    
          
  69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

                    end
          
    71. 
        
    
      
        
    
          
  71. 
            
            

            

            
          
    72. 
        
    
      
        
    
          
  72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

                  end
          
    74. 
        
    
      
        
    
          
  74. 
            
            

            

                end
          
    75. 
        
    
      
        
    
          
  75. 
            
            

            

              end
          
    76. 
        
    
      
        
    
          
  76. 
            
            

            

            end
          
    77.

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            RSpec.describe AdminUser, type: :model do
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
              context 'when validations' do
=======
              describe 'Get Started' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  5. 
            2
=======
          
  6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  7. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
          
  8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  9. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
          
  10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  11. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                it { is_expected.to validate_presence_of(:email) }
=======
                it 'on click move to catalog page' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  13. 
            2
=======
          
  14. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  15. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
          
  16. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  17. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
          
  18. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  19. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  20. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                it { is_expected.to validate_presence_of(:password) }
=======
                  visit root_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit root_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            
          
    22. 
        
    
      
        
    
          
  22. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                context 'when associations' do
=======
                  click_on 'Get Started'
>>>>>>> 93bdda9 (Featire specs)
=======
                  click_on 'Get Started'
>>>>>>> 2a25e4c (Featire specs)
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  23. 
            2
=======
          
  24. 
            
>>>>>>> 93bdda9 (Featire specs)
=======
          
  25. 
            
>>>>>>> 2a25e4c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
            
>>>>>>> 93bdda9 (Featire specs)
=======
            
>>>>>>> 2a25e4c (Featire specs)
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
            2
=======
          
  27. 
            1
>>>>>>> 93bdda9 (Featire specs)
=======
          
  28. 
            1
>>>>>>> 2a25e4c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  expect(page).to have_content('Catalog')
>>>>>>> 93bdda9 (Featire specs)
=======
                  expect(page).to have_content('Catalog')
>>>>>>> 2a25e4c (Featire specs)
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
              end
          
    31. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  31. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  32. 
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  33. 
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  34. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

              describe 'navbar' do
          
    36. 
        
    
      
        
    
          
  36. 
            2
            

            

                let(:books_category) { FactoryBot.create(:books_category) }
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                it 'on click home move to root-path' do
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

                  visit books_path
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

                  find('a', id: 'root').click
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

                end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                  books_category
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

            
          
    49. 
        
    
      
        
    
          
  49. 
            1
            

            

                  visit root_path
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

                  within('ul', id: 'nav') do
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

                  end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

                end
          
    59. 
        
    
      
        
    
          
  59. 
            
            

            

              end
          
    60. 
        
    
      
        
    
          
  60. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            
            

            

            end
          
    61.

spec/models/author_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            RSpec.describe Author, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  2. 
            1
            

            

              describe 'author' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
=======
          
  8. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  9. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  10. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  11. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  13. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  14. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  15. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  16. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            
            

            

            
          
    18. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  18. 
=======
          
  19. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  20. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  21. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  22. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  23. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  24. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  25. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  26. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  27. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  28. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                context 'when associations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  29. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  30. 
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  31. 
            1
            

            

              describe 'author' do
          
    32. 
        
    
      
        
    
          
  32. 
            1
            

            

                context 'when validations' do
          
    33. 
        
    
      
        
    
          
  33. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  34. 
=======
          
  35. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  36. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  37. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  38. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  39. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  40. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  41. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  42. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  43. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  44. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  49. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  50. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  52. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  53. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  54. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  55. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    56. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  56. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  57. 
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  58. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  59. 
            
            

            

            
          
    60. 
        
    
      
        
    
          
  60. 
            1
            

            

                context 'when associations' do
          
    61. 
        
    
      
        
    
          
  61. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    62. 
        
    
      
        
    
          
  62. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

                end
          
    64. 
        
    
      
        
    
          
  64. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  65. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  66. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  67. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            
            

            

            
          
    68. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  68. 
=======
          
  69. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  70. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  71. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  72. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  73. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  74. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  75. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                context 'when associations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
    76. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  76. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  77. 
=======
          
  78. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

              describe 'author' do
          
    79. 
        
    
      
        
    
          
  79. 
            1
            

            

                context 'when validations' do
          
    80. 
        
    
      
        
    
<<<<<<< HEAD
          
  80. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  81. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    82. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  82. 
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
  83. 
=======
          
  84. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  85. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  86. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  87. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  88. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  89. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  90. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  91. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    92. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  92. 
=======
          
  93. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  94. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  95. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  96. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  97. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  98. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  99. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  100. 
=======
          
  101. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  102. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  103. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  104. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  105. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  106. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  107. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  108. 
>>>>>>> 1577aeb (Rebased)
            
            

            

                end
          
    109. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  109. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
  110. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  111. 
=======
          
  112. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    113. 
        
    
      
        
    
          
  113. 
            1
            

            

                context 'when associations' do
          
    114. 
        
    
      
        
    
          
  114. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    115. 
        
    
      
        
    
          
  115. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
    116. 
        
    
      
        
    
          
  116. 
            
            

            

                end
          
    117. 
        
    
      
        
    
<<<<<<< HEAD
          
  117. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  118. 
>>>>>>> 1577aeb (Rebased)
            
            

            

              end
          
    119. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  119. 
=======
          
  120. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  121. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  122. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  123. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  124. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  125. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  126. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  127. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  128. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  129. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            
            

            

=======
>>>>>>> ee78f39 (Rebased)
            end
          
    130.

spec/models/authors_book_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 8 relevant lines. 8 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            RSpec.describe AuthorsBook, type: :model do
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  4. 
=======
          
  5. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  6. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  7. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  8. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  9. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  10. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  11. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  12. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  14. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  15. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  16. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  17. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  18. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            1
            

            

              describe 'authors_book' do
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  19. 
=======
          
  20. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  22. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  23. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  25. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  27. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  28. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  29. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  30. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  31. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  32. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  33. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when validations' do
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  34. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
            1
            

            

                context 'when associations' do
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
    40. 
        
    
      
        
    
          
  40. 
<<<<<<< HEAD
<<<<<<< HEAD
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

              end
          
    43. 
        
    
      
        
    
=======
>>>>>>> 1577aeb (Rebased)
          
  43. 
            
            

            

            end
          
    44.

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'billing' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
  6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
>>>>>>> 1577aeb (Rebased)
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
>>>>>>> 1577aeb (Rebased)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
<<<<<<< HEAD
=======
          
  12. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
            
            

            

                end
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  19. 
=======
          
  20. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  22. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  23. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  25. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  27. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    28. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1577aeb (Rebased)
          
  28. 
            1
            

            

                context 'when not validations' do
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                end
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

            
          
    38. 
        
    
      
        
    
          
  38. 
<<<<<<< HEAD
=======
          
  39. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  40. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  41. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  42. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  43. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  44. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  45. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
            1
            

            

                context 'when associations' do
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  46. 
=======
          
  47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  50. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  54. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:user) }
>>>>>>> 1577aeb (Rebased)
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  55. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  56. 
=======
>>>>>>> ee78f39 (Rebased)
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
          
  57. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  58. 
>>>>>>> ee78f39 (Rebased)
=======
          
  59. 
>>>>>>> 1577aeb (Rebased)
            
            

            

                end
          
    60. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  60. 
=======
          
  61. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  62. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  63. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  64. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  66. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  67. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  68. 
>>>>>>> ee78f39 (Rebased)
=======
          
  69. 
>>>>>>> 1577aeb (Rebased)
            
            

            

              end
          
    70. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  70. 
=======
          
  71. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  72. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  73. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  74. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  75. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  76. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  77. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  78. 
            
            

            

            end
          
    79.

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'billing' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
=======
          
  12. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  19. 
=======
          
  20. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  22. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  23. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  25. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
            1
            

            

                context 'when not validations' do
          
    28. 
        
    
      
        
    
          
  28. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when associations' do
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  49. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  50. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  51. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  52. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  53. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  54. 
=======
>>>>>>> 836a973 (Rebased)
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
          
  55. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  56. 
>>>>>>> 836a973 (Rebased)
            
            

            

                end
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  57. 
=======
          
  58. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  59. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  60. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  61. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  63. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  64. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  65. 
>>>>>>> 836a973 (Rebased)
            
            

            

              end
          
    66. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  66. 
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  67. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  68. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
          
  69. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  70. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
          
  71. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  72. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
          
  73. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  74. 
            
            

            

            end
          
    75.

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'billing' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
=======
          
  12. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    19. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  19. 
=======
          
  20. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  22. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  23. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  25. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

            
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
            1
            

            

                context 'when not validations' do
          
    28. 
        
    
      
        
    
          
  28. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    30. 
        
    
      
        
    
          
  30. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
=======
          
  38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  40. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  41. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  44. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            1
            

            

                context 'when associations' do
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  45. 
=======
          
  46. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  48. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  49. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  50. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  51. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  52. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  53. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  54. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    55. 
        
    
      
        
    
          
  55. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
    56. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  56. 
=======
          
  57. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  58. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  59. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  60. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  61. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  62. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  63. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            
            

            

              end
          
    64. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  64. 
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
          
  65. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  66. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  67. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  68. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  69. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  70. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  71. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  72. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            end
          
    73.

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            1
=======
          
  3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  5. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  6. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  8. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  9. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  11. 
            1
=======
          
  12. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  13. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  16. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  17. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  18. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  20. 
            1
=======
          
  21. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  22. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  23. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  24. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
  25. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  26. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
  27. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    28. 
        
    
      
        
    
          
  28. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
            RSpec.describe Book, type: :model do
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              describe 'books' do
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                context 'when validations' do
          
    31. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
  31. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
    33. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  33. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:year_of_publication) }
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
          
    35. 
        
    
      
        
    
          
  35. 
=======
          
  36. 
>>>>>>> ee78f39 (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
>>>>>>> ee78f39 (Rebased)
          
    37. 
        
    
      
        
    
          
  37. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
    38. 
        
    
      
        
    
          
  38. 
=======
          
  39. 
>>>>>>> 836a973 (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
>>>>>>> 836a973 (Rebased)
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
    41. 
        
    
      
        
    
          
  41. 
=======
          
  42. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
>>>>>>> 1577aeb (Rebased)
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
    44. 
        
    
      
        
    
          
  44. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
          
    45. 
        
    
      
        
    
          
  45. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
    46. 
        
    
      
        
    
          
  46. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:dimensions) }
          
    47. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  47. 
=======
          
  48. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  49. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  50. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  52. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  53. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  54. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  55. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  56. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  57. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  58. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  59. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  60. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  61. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  62. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  63. 
>>>>>>> 1577aeb (Rebased)
            
            

            

                end
          
    64. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  64. 
=======
          
  65. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  66. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  67. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  68. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  69. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  70. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  71. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  72. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  73. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  74. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  75. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  76. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  77. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  78. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  79. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  80. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    81. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  81. 
=======
          
  82. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  83. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  84. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  85. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  86. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  87. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  88. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  89. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  90. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  91. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  92. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  93. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  94. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  95. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  96. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  97. 
>>>>>>> 1577aeb (Rebased)
            1
            

            

                context 'when associations' do
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  98. 
=======
          
  99. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  100. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  101. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  102. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  103. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  104. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  105. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  106. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  107. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  108. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  109. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  110. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  111. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  112. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  113. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  114. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
    115. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  115. 
=======
          
  116. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  117. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  118. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  119. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  120. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  121. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  122. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  123. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  124. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  125. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  126. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  127. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  128. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  129. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  130. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  131. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
    132. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  132. 
=======
          
  133. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  134. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  135. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  136. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  137. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  138. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  139. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  140. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  141. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  142. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  143. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  144. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  145. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  146. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  147. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  148. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    149. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  149. 
=======
          
  150. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  151. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  152. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  153. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  154. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  155. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  156. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  157. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  158. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  159. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  160. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  161. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  162. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  163. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  164. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  165. 
>>>>>>> 1577aeb (Rebased)
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    166. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
  166. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
    167. 
        
    
      
        
    
          
  167. 
            
            

            

            
          
    168. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
  168. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
>>>>>>> 1577aeb (Rebased)
          
    169. 
        
    
      
        
    
          
  169. 
            
            

            

                end
          
    170. 
        
    
      
        
    
          
  170. 
            
            

            

              end
          
    171. 
        
    
      
        
    
          
  171. 
            
            

            

            end
          
    172.

spec/models/books_category_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) 8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'books_categories' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                context 'when associations' do
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'category' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                end
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

                context 'when associations' do
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

              end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            end
          
    13.

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            RSpec.describe Review, type: :model do
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Review, type: :model do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Review, type: :model do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Review, type: :model do
>>>>>>> 1577aeb (Rebased)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
              describe 'review' do
=======
              describe 'books_categories' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'review' do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
              describe 'review' do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
              describe 'review' do
>>>>>>> 1577aeb (Rebased)
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:title) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 1577aeb (Rebased)
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
                  it { is_expected.to validate_presence_of(:body) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                context 'when associations' do
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            end
          
    21.

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              describe 'shipping' do
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                context 'when validations' do
          
    4. 
        
    
      
        
    
          
  4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
    8. 
        
    
      
        
    
          
  8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
    9. 
        
    
      
        
    
          
  9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
    10. 
        
    
      
        
    
          
  10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

            
          
    13. 
        
    
      
        
    
          
  13. 
            1
            

            

                context 'when not validations' do
          
    14. 
        
    
      
        
    
          
  14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
    16. 
        
    
      
        
    
          
  16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
    18. 
        
    
      
        
    
          
  18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
    19. 
        
    
      
        
    
          
  19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
    20. 
        
    
      
        
    
          
  20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

                context 'when associations' do
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                end
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec.describe User, type: :model do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              describe 'author' do
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                context 'when validations' do
          
    6. 
        
    
      
        
    
          
  6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                context 'with associations' do
=======
                context 'when associations' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'with associations' do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                context 'with associations' do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                context 'with associations' do
>>>>>>> 1577aeb (Rebased)
          
    11. 
        
    
      
        
    
          
  11. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_one(:billing) }
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to have_one(:billing) }
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_one(:billing) }
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_one(:billing) }
>>>>>>> 1577aeb (Rebased)
          
    12. 
        
    
      
        
    
          
  12. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_one(:shipping) }
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to have_one(:shipping) }
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_one(:shipping) }
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_one(:shipping) }
>>>>>>> 1577aeb (Rebased)
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

              end
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            end
          
    16.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)

spec/queryes/book_query_spec.rb

=======

spec/models/category_spec.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======

spec/queryes/book_query_spec.rb

>>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======

spec/queryes/book_query_spec.rb

>>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======

spec/queryes/book_query_spec.rb

>>>>>>> 1577aeb (Rebased)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 45 relevant lines. 45 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> 1577aeb (Rebased) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            RSpec.describe BookQuery do
=======
            RSpec.describe Category, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BookQuery do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BookQuery do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BookQuery do
>>>>>>> 1577aeb (Rebased)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
              shared_examples 'sort test' do
=======
              describe 'category' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'category' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              shared_examples 'sort test' do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
              shared_examples 'sort test' do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
              shared_examples 'sort test' do
>>>>>>> 1577aeb (Rebased)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  5. 
            5
=======
          
  6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  7. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
          
  8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  9. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
          
  10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  11. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  13. 
            5
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  14. 
            5
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  15. 
            5
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                it 'sort' do
=======
                context 'when validations' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'sort' do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                it 'sort' do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                it 'sort' do
>>>>>>> 1577aeb (Rebased)
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  16. 
            5
=======
          
  17. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  18. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
          
  19. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  20. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
          
  21. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  22. 
            2
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  23. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  24. 
            5
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  25. 
            5
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  26. 
            5
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
                  books
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  books
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
                  books
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
                  books
>>>>>>> 1577aeb (Rebased)
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  27. 
            5
            

            

                  expect(test).to eq(result)
          
    28. 
        
    
      
        
    
          
  28. 
=======
          
  29. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  30. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  31. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  32. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  33. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  34. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  35. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
          
  36. 
            5
>>>>>>> ee78f39 (Rebased)
            

            

                  expect(test).to eq(result)
          
    37. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  37. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  38. 
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  40. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
          
  41. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
            
=======
          
  42. 
            5
>>>>>>> 836a973 (Rebased)
            

            

                  expect(test).to eq(result)
          
    43. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  43. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  44. 
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  45. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  46. 
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  47. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  48. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
          
  49. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
            
=======
          
  50. 
            5
>>>>>>> 1577aeb (Rebased)
            

            

                  expect(test).to eq(result)
          
    51. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  51. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  52. 
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
          
  53. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
  54. 
            
            

            

                end
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
          
  55. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  56. 
>>>>>>> 1577aeb (Rebased)
            
            

            

              end
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
          
  57. 
            
            

            

            end
          
    58.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb955a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages)

spec/models/user_spec.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'rails_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            RSpec.describe User, type: :model do
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              pending "add some examples to (or delete) #{__FILE__}"
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            end
          
    6.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages)

spec/rails_helper.rb

87.5% lines covered

16 relevant lines. 14 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'spec_helper'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            ENV['RAILS_ENV'] ||= 'test'
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            require_relative '../config/environment'
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            abort('The Rails environment is running in production mode!') if Rails.env.production?
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

            require 'rspec/rails'
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

            require 'shoulda-matchers'
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

            require_relative 'support/configs/shoulda_matcher'
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

            require_relative 'support/configs/capybara'
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 83979de (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  11. 
            3
=======
          
  12. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  13. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
          
  14. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  15. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  16. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  17. 
            3
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
          
  18. 
            3
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  19. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  20. 
            3
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              let(:titles) { %w[Adam Zimbabwe] }
=======
            begin
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
=======
            begin
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            begin
>>>>>>> 08edf50 (Featire specs)
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:titles) { %w[Adam Zimbabwe] }
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            begin
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
              let(:titles) { %w[Adam Zimbabwe] }
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            begin
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
            begin
>>>>>>> cde4834 (Manifest_cache true)
=======
              let(:titles) { %w[Adam Zimbabwe] }
>>>>>>> 1577aeb (Rebased)
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              let(:books_dates) do
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:books_dates) do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
              let(:books_dates) do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> cde4834 (Manifest_cache true)
=======
              let(:books_dates) do
>>>>>>> 1577aeb (Rebased)
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  22. 
            1
=======
          
  23. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  24. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
          
  25. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  26. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  27. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  28. 
            1
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
          
  29. 
            1
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  30. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  31. 
            1
>>>>>>> 1577aeb (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> cde4834 (Manifest_cache true)
=======
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
>>>>>>> 1577aeb (Rebased)
          
    32. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  32. 
=======
          
  33. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  34. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  35. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  36. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  37. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  38. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  39. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  40. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
          
  41. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  42. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  43. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  44. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  45. 
>>>>>>> 1577aeb (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              end
=======
              puts e.to_s.strip
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              end
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
              end
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> cde4834 (Manifest_cache true)
=======
              end
>>>>>>> 1577aeb (Rebased)
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  46. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
          
  47. 
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
          
  48. 
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> cde4834 (Manifest_cache true)
          
  49. 
            
            

            

              exit 1
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            end
          
    51. 
        
    
      
        
    
          
  51. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  52. 
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
          
  53. 
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  54. 
>>>>>>> 1577aeb (Rebased)
            
            

            

            
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
          
  55. 
            1
            

            

              describe 'all books sort' do
          
    56. 
        
    
      
        
    
          
  56. 
            1
            

            

                context 'when sort by title A to Z' do
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
          
  57. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                  let(:books) do
=======
            RSpec.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:books) do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
                  let(:books) do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> cde4834 (Manifest_cache true)
=======
                  let(:books) do
>>>>>>> 1577aeb (Rebased)
          
    58. 
        
    
      
        
    
          
  58. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                    create(:book, title: titles.first)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    create(:book, title: titles.first)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
                    create(:book, title: titles.first)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> cde4834 (Manifest_cache true)
=======
                    create(:book, title: titles.first)
>>>>>>> 1577aeb (Rebased)
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                    create(:book, title: titles.second)
=======
              config.use_transactional_fixtures = true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    create(:book, title: titles.second)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
                    create(:book, title: titles.second)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> cde4834 (Manifest_cache true)
=======
                    create(:book, title: titles.second)
>>>>>>> 1577aeb (Rebased)
          
    60. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
          
  60. 
            
            

            

                  end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            2
            

            

                  let(:result) { titles.second }
          
    63. 
        
    
      
        
    
          
  63. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  66. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  67. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  68. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  69. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  70. 
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  71. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
          
  72. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
          
  73. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
          
  74. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  75. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  76. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  77. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                  include_examples 'sort test'
=======
              config.infer_spec_type_from_file_location!
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  include_examples 'sort test'
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
                  include_examples 'sort test'
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> cde4834 (Manifest_cache true)
=======
                  include_examples 'sort test'
>>>>>>> 1577aeb (Rebased)
          
    78. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
          
  78. 
            
            

            

                end
          
    79. 
        
    
      
        
    
          
  79. 
            
            

            

            
          
    80. 
        
    
      
        
    
          
  80. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  81. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  82. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  83. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  84. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  85. 
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  86. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
          
  87. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
          
  88. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
          
  89. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  90. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  91. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  92. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                context 'when sort title Z to A' do
=======
              config.filter_rails_from_backtrace!
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when sort title Z to A' do
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
                context 'when sort title Z to A' do
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> cde4834 (Manifest_cache true)
=======
                context 'when sort title Z to A' do
>>>>>>> 1577aeb (Rebased)
          
    93. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
          
  93. 
            1
            

            

                  let(:books) do
          
    94. 
        
    
      
        
    
          
  94. 
            1
            

            

                    create(:book, title: titles.first)
          
    95. 
        
    
      
        
    
          
  95. 
            1
            

            

                    create(:book, title: titles.second)
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

                  end
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

            
          
    98. 
        
    
      
        
    
          
  98. 
            2
            

            

                  let(:result) { titles.first }
          
    99. 
        
    
      
        
    
          
  99. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

            
          
    101. 
        
    
      
        
    
          
  101. 
            1
            

            

                  include_examples 'sort test'
          
    102. 
        
    
      
        
    
          
  102. 
            
            

            

                end
          
    103. 
        
    
      
        
    
          
  103. 
            
            

            

            
          
    104. 
        
    
      
        
    
          
  104. 
            1
            

            

                context 'when sort by price High to Low' do
          
    105. 
        
    
      
        
    
          
  105. 
            1
            

            

                  let(:books) do
          
    106. 
        
    
      
        
    
          
  106. 
            1
            

            

                    create(:book, price_cents: 75)
          
    107. 
        
    
      
        
    
          
  107. 
            1
            

            

                    create(:book, price_cents: 23)
          
    108. 
        
    
      
        
    
          
  108. 
            
            

            

                  end
          
    109. 
        
    
      
        
    
          
  109. 
            
            

            

            
          
    110. 
        
    
      
        
    
          
  110. 
            2
            

            

                  let(:result) { 75 }
          
    111. 
        
    
      
        
    
          
  111. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
    112. 
        
    
      
        
    
          
  112. 
            
            

            

            
          
    113. 
        
    
      
        
    
          
  113. 
            1
            

            

                  include_examples 'sort test'
          
    114. 
        
    
      
        
    
          
  114. 
            
            

            

                end
          
    115. 
        
    
      
        
    
          
  115. 
            
            

            

            
          
    116. 
        
    
      
        
    
          
  116. 
            1
            

            

                context 'when sort price Low to High' do
          
    117. 
        
    
      
        
    
          
  117. 
            1
            

            

                  let(:books) do
          
    118. 
        
    
      
        
    
          
  118. 
            1
            

            

                    create(:book, price_cents: 75)
          
    119. 
        
    
      
        
    
          
  119. 
            1
            

            

                    create(:book, price_cents: 23)
          
    120. 
        
    
      
        
    
          
  120. 
            
            

            

                  end
          
    121. 
        
    
      
        
    
          
  121. 
            
            

            

            
          
    122. 
        
    
      
        
    
          
  122. 
            2
            

            

                  let(:result) { 23 }
          
    123. 
        
    
      
        
    
          
  123. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
    124. 
        
    
      
        
    
          
  124. 
            
            

            

            
          
    125. 
        
    
      
        
    
          
  125. 
            1
            

            

                  include_examples 'sort test'
          
    126. 
        
    
      
        
    
          
  126. 
            
            

            

                end
          
    127. 
        
    
      
        
    
          
  127. 
            
            

            

            
          
    128. 
        
    
      
        
    
          
  128. 
            1
            

            

                context 'when sort by Newest' do
          
    129. 
        
    
      
        
    
          
  129. 
            1
            

            

                  let(:books) do
          
    130. 
        
    
      
        
    
          
  130. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
    131. 
        
    
      
        
    
          
  131. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
    132. 
        
    
      
        
    
          
  132. 
            
            

            

                  end
          
    133. 
        
    
      
        
    
          
  133. 
            
            

            

            
          
    134. 
        
    
      
        
    
          
  134. 
            2
            

            

                  let(:result) { books_dates.first }
          
    135. 
        
    
      
        
    
          
  135. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
    136. 
        
    
      
        
    
          
  136. 
            
            

            

            
          
    137. 
        
    
      
        
    
          
  137. 
            1
            

            

                  include_examples 'sort test'
          
    138. 
        
    
      
        
    
          
  138. 
            
            

            

                end
          
    139. 
        
    
      
        
    
          
  139. 
            
            

            

              end
          
    140. 
        
    
      
        
    
          
  140. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  141. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  142. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  143. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  144. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  145. 
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  146. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
          
  147. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
          
  148. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
          
  149. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
          
  150. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  151. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  152. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
            
            

            

            end
          
    153.
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased)

spec/support/configs/capybara.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= 36.84% >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= 19 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= 7 lines covered and 12 lines missed. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) 
    
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
          
  1. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
          
  2. 
            1
=======
          
  3. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
  4. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  5. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
  6. 
            1
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
          
  7. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  8. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  9. 
            1
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  10. 
            1
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
          
  11. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  12. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  13. 
            1
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  14. 
            1
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
          
  15. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  16. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  17. 
            1
>>>>>>> bf554f4 (Rebased)
=======
          
  18. 
            1
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  19. 
            1
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
          
  20. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  21. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  22. 
            1
>>>>>>> bf554f4 (Rebased)
            

            

            Capybara.configure do |config|
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
          
    23. 
        
    
      
        
    
          
  23. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  24. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
            1
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
          
  25. 
            1
=======
          
  26. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
          
  27. 
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
          
    28. 
        
    
      
        
    
          
  28. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  29. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
            1
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
          
  30. 
            1
=======
          
  31. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
          
  32. 
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> 3dc272d (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
          
    33. 
        
    
      
        
    
          
  33. 
=======
          
  34. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
          
    35. 
        
    
      
        
    
          
  35. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  36. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
            1
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
          
  37. 
            1
=======
          
  38. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
          
  39. 
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 752f0c0 (Featire specs)
          
    40. 
        
    
      
        
    
          
  40. 
=======
          
  41. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
          
    42. 
        
    
      
        
    
          
  42. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  43. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
            1
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
          
  44. 
            1
=======
          
  45. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
          
  46. 
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
          
    47. 
        
    
      
        
    
          
  47. 
=======
          
  48. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
    49. 
        
    
      
        
    
          
  49. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  50. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  51. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
          
  52. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 078304c (Rebased)
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> e5752db (Featire specs)
          
    53. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  53. 
=======
          
  54. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
=======
>>>>>>> e5752db (Featire specs)
          
  55. 
=======
          
  56. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    57. 
        
    
      
        
    
          
  57. 
=======
          
  58. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
          
    59. 
        
    
      
        
    
          
  59. 
=======
          
  60. 
>>>>>>> 183b6c5 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
    61. 
        
    
      
        
    
          
  61. 
=======
          
  62. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    63. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  63. 
            
=======
          
  64. 
=======
          
  65. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  66. 
=======
          
  67. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  68. 
=======
          
  69. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  70. 
=======
          
  71. 
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    72. 
        
    
      
        
    
          
  72. 
=======
          
  73. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
          
    74. 
        
    
      
        
    
          
  74. 
=======
          
  75. 
>>>>>>> 183b6c5 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
              config.server_port = 3001
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
    76. 
        
    
      
        
    
          
  76. 
=======
          
  77. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    78. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  78. 
            
=======
          
  79. 
=======
          
  80. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  81. 
=======
          
  82. 
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  83. 
=======
          
  84. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  85. 
=======
          
  86. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> a9bf83f (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
          
    87. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  87. 
            
=======
          
  88. 
=======
          
  89. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  90. 
=======
          
  91. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
          
  92. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
  93. 
=======
          
  94. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  95. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  96. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    97. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
          
  97. 
            
=======
          
  98. 
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  99. 
=======
          
  100. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  101. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  102. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
    103. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  103. 
            
=======
          
  104. 
=======
          
  105. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    106. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
          
  106. 
            
=======
          
  107. 
=======
          
  108. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  109. 
=======
          
  110. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  111. 
=======
          
  112. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  113. 
=======
          
  114. 
=======
          
  115. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  116. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  117. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  118. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
=======
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
          
    119. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
>>>>>>> c033601 (Rebased)
          
  119. 
=======
=======
          
  120. 
=======
          
  121. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
  122. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
          
  123. 
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  124. 
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
          
  125. 
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 49e8a6c (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
    126. 
        
    
      
        
    
<<<<<<< HEAD
          
  126. 
=======
          
  127. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  128. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
          
    129. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  129. 
=======
          
  130. 
>>>>>>> b459807 (Manifest_cache true)
=======
          
  131. 
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  132. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
  133. 
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 6fba6be (Featire specs)
          
  134. 
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
  135. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
  136. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
<<<<<<< HEAD
=======
=======
>>>>>>> e5752db (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 49e8a6c (Rebased)
          
    137. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  137. 
=======
          
  138. 
>>>>>>> 904663c (Featire specs)
=======
          
  139. 
>>>>>>> b459807 (Manifest_cache true)
=======
          
  140. 
>>>>>>> 2ba25f7 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
    141. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
  141. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
  142. 
=======
          
  143. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  144. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  145. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  146. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
          
    147. 
        
    
      
        
    
          
  147. 
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
>>>>>>> 08edf50 (Featire specs)
          
    148. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
          
  148. 
=======
>>>>>>> df37394 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  149. 
=======
          
  150. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  151. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  152. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  153. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  154. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  155. 
>>>>>>> c033601 (Rebased)
            1
=======
          
  156. 
=======
          
  157. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  158. 
=======
          
  159. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
          
    160. 
        
    
      
        
    
<<<<<<< HEAD
          
  160. 
=======
          
  161. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    162. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  162. 
            
=======
          
  163. 
=======
          
  164. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  165. 
=======
          
  166. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  167. 
=======
          
  168. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  169. 
=======
          
  170. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    171. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  171. 
            
=======
          
  172. 
=======
          
  173. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  174. 
=======
          
  175. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  176. 
=======
          
  177. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
          
    178. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
          
  178. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
  179. 
=======
          
  180. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  181. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  182. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  183. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            
<<<<<<< HEAD
=======
=======
          
  184. 
=======
          
  185. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  186. 
=======
          
  187. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  188. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  189. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  190. 
=======
          
  191. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  192. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    193. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  193. 
=======
          
  194. 
=======
          
  195. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  196. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
          
  197. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
    198. 
        
    
      
        
    
<<<<<<< HEAD
          
  198. 
=======
          
  199. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
=======
>>>>>>> 8f1bc14 (Fix)
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    200. 
        
    
      
        
    
          
  200. 
=======
          
  201. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
          
    202. 
        
    
      
        
    
          
  202. 
=======
          
  203. 
>>>>>>> 183b6c5 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
    204. 
        
    
      
        
    
          
  204. 
=======
          
  205. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    206. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  206. 
            
=======
          
  207. 
=======
          
  208. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  209. 
=======
          
  210. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  211. 
=======
          
  212. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  213. 
=======
          
  214. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5be567f (Featire specs)
              config.default_driver = :rack_test
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 0b43b18 (Manifest_cache true)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
          
    215. 
        
    
      
        
    
          
  215. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
    216. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  216. 
=======
          
  217. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  218. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  219. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  220. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  221. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
            end
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    222. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  222. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  223. 
=======
          
  224. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  225. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  226. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  227. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  228. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  229. 
>>>>>>> c033601 (Rebased)
            1
=======
          
  230. 
=======
          
  231. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  232. 
=======
          
  233. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 96aecde (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 3b03895 (Featire specs)
          
    234. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  234. 
            
=======
          
  235. 
=======
          
  236. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  237. 
=======
          
  238. 
<<<<<<< HEAD
=======
          
  239. 
>>>>>>> 3b03895 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
          
    240. 
        
    
      
        
    
          
  240. 
            1
            

            

=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
          
    241. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  241. 
            1
=======
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  242. 
            
=======
<<<<<<< HEAD
          
  243. 
=======
=======
          
  244. 
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
  245. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  246. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
          
  247. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  248. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
          
  249. 
            
=======
          
  250. 
=======
          
  251. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  252. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
  253. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  254. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  255. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    256. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
          
  256. 
            
=======
          
  257. 
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  258. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  259. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  260. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
    261. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  261. 
            
=======
          
  262. 
=======
          
  263. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
          
    264. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  264. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
          
  265. 
            
=======
          
  266. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  267. 
=======
          
  268. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  269. 
=======
          
  270. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  271. 
=======
          
  272. 
=======
          
  273. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
          
    274. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
          
  274. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  275. 
>>>>>>> bf554f4 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> c033601 (Rebased)
          
  276. 
=======
=======
          
  277. 
=======
          
  278. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
  279. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
          
    280. 
        
    
      
        
    
          
  280. 
            1
            

            

              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
          
    281. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
  281. 
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
          
  282. 
=======
          
  283. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
=======
          
  284. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
          
    285. 
        
    
      
        
    
          
  285. 
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
          
    286. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
          
  286. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  287. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  288. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  289. 
>>>>>>> bf554f4 (Rebased)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
          
  290. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  291. 
=======
          
  292. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  293. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  294. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  295. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  296. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
          
  297. 
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
            1
=======
<<<<<<< HEAD
          
  298. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  299. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  300. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  301. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  302. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  303. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
          
  304. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  305. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  306. 
            1
>>>>>>> c033601 (Rebased)
>>>>>>> d780a52 (Rebased)
=======
          
  307. 
=======
          
  308. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  309. 
=======
          
  310. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
          
    311. 
        
    
      
        
    
<<<<<<< HEAD
          
  311. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  312. 
            
=======
<<<<<<< HEAD
          
  313. 
=======
=======
          
  314. 
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
  315. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  316. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
          
  317. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  318. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
          
  319. 
            
=======
          
  320. 
=======
          
  321. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  322. 
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7c4ea7f (Fix)
          
    323. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  323. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  324. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  325. 
>>>>>>> bf554f4 (Rebased)
=======
=======
          
  326. 
=======
=======
          
  327. 
            1
            

            

              config.default_driver = :rack_test
          
    328. 
        
    
      
        
    
>>>>>>> b15044a (Manifest_cache true)
          
  328. 
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  329. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
          
    330. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
          
  330. 
>>>>>>> 845dac1 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
          
    331. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
  331. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  332. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  333. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  334. 
>>>>>>> bf554f4 (Rebased)
            1
=======
<<<<<<< HEAD
          
  335. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  336. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  337. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  338. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  339. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  340. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
          
  341. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  342. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  343. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
          
  344. 
=======
          
  345. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
  346. 
=======
          
  347. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
              config.server_port = 3001
=======
              config.default_driver = :rack_test
>>>>>>> 394c6f3 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
          
    348. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  348. 
            
=======
          
  349. 
=======
          
  350. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  351. 
=======
          
  352. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  353. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
  354. 
=======
          
  355. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  356. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  357. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    358. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
          
  358. 
            
=======
          
  359. 
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  360. 
=======
          
  361. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  362. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  363. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
    364. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  364. 
            
=======
          
  365. 
=======
          
  366. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    367. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
          
  367. 
            
=======
          
  368. 
=======
          
  369. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  370. 
=======
          
  371. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  372. 
=======
          
  373. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  374. 
=======
          
  375. 
=======
          
  376. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  377. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  378. 
=======
          
  379. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
          
    380. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
  380. 
=======
=======
          
  381. 
=======
          
  382. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
  383. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
          
  384. 
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
  385. 
>>>>>>> 00f8b58 (Manifest_cache true)
            1
            

            

=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
    386. 
        
    
      
        
    
<<<<<<< HEAD
          
  386. 
=======
          
  387. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  388. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
          
    389. 
        
    
      
        
    
<<<<<<< HEAD
          
  389. 
=======
          
  390. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  391. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
          
    392. 
        
    
      
        
    
<<<<<<< HEAD
          
  392. 
=======
          
  393. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    394. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  394. 
            
=======
          
  395. 
=======
          
  396. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  397. 
=======
          
  398. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  399. 
=======
          
  400. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  401. 
=======
          
  402. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    403. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  403. 
            
=======
          
  404. 
=======
          
  405. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  406. 
=======
          
  407. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  408. 
=======
          
  409. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
          
    410. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
          
  410. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
  411. 
=======
          
  412. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  413. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  414. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  415. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            
<<<<<<< HEAD
=======
=======
          
  416. 
=======
          
  417. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  418. 
=======
          
  419. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  420. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  421. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  422. 
=======
          
  423. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  424. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    425. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  425. 
=======
          
  426. 
=======
          
  427. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  428. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
          
  429. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
          
    430. 
        
    
      
        
    
          
  430. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  431. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
    432. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  432. 
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  433. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  434. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
    435. 
        
    
      
        
    
<<<<<<< HEAD
          
  435. 
=======
          
  436. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  437. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
          
    438. 
        
    
      
        
    
<<<<<<< HEAD
          
  438. 
=======
          
  439. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  440. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
=======
=======
>>>>>>> 3dc272d (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
          
    441. 
        
    
      
        
    
<<<<<<< HEAD
          
  441. 
=======
          
  442. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    443. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  443. 
            
=======
          
  444. 
=======
          
  445. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  446. 
=======
          
  447. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  448. 
=======
          
  449. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  450. 
=======
          
  451. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
              config.server_port = 3001
=======
=======
>>>>>>> a2de409 (Featire specs)
              config.default_driver = :rack_test
>>>>>>> b5f64c6 (Manifest_cache true)
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
          
    452. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  452. 
=======
          
  453. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  454. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  455. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  456. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  457. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
            end
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> b5f64c6 (Manifest_cache true)
          
    458. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  458. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  459. 
=======
          
  460. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  461. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  462. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  463. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  464. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  465. 
>>>>>>> c033601 (Rebased)
            1
=======
          
  466. 
=======
          
  467. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  468. 
=======
          
  469. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 96aecde (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 3b03895 (Featire specs)
          
    470. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
          
  470. 
            
=======
          
  471. 
=======
          
  472. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  473. 
=======
          
  474. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  475. 
>>>>>>> 3b03895 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54ceb0 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    476. 
        
    
      
        
    
<<<<<<< HEAD
          
  476. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  477. 
            
=======
<<<<<<< HEAD
          
  478. 
=======
=======
          
  479. 
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
  480. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  481. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
          
  482. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  483. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
          
  484. 
            
=======
          
  485. 
=======
          
  486. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  487. 
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7c4ea7f (Fix)
          
    488. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  488. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  489. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  490. 
>>>>>>> bf554f4 (Rebased)
=======
=======
          
  491. 
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
          
  492. 
=======
          
  493. 
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
          
    494. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
          
  494. 
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  495. 
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  496. 
>>>>>>> 866aee4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
          
    497. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
          
  497. 
>>>>>>> 845dac1 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
          
    498. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
  498. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  499. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  500. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  501. 
>>>>>>> bf554f4 (Rebased)
            1
=======
<<<<<<< HEAD
          
  502. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  503. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  504. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  505. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  506. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  507. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  508. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  509. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  510. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
          
  511. 
=======
          
  512. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  513. 
=======
          
  514. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
          
    515. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  515. 
            
=======
          
  516. 
=======
          
  517. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  518. 
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  519. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  520. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  521. 
=======
          
  522. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  523. 
            1
>>>>>>> 4552227 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
          
    524. 
        
    
      
        
    
<<<<<<< HEAD
          
  524. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
          
    525. 
        
    
      
        
    
<<<<<<< HEAD
          
  525. 
=======
          
  526. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
=======
>>>>>>> 8f1bc14 (Fix)
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    527. 
        
    
      
        
    
          
  527. 
=======
          
  528. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
          
    529. 
        
    
      
        
    
          
  529. 
=======
          
  530. 
>>>>>>> 183b6c5 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
    531. 
        
    
      
        
    
          
  531. 
=======
          
  532. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    533. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  533. 
            
=======
          
  534. 
=======
          
  535. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  536. 
=======
          
  537. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  538. 
=======
          
  539. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  540. 
=======
          
  541. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
          
    542. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  542. 
            
=======
          
  543. 
=======
          
  544. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  545. 
=======
          
  546. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
  547. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
  548. 
=======
          
  549. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  550. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  551. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
    552. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
          
  552. 
            
=======
          
  553. 
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  554. 
=======
          
  555. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  556. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  557. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
    558. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  558. 
            
=======
          
  559. 
=======
          
  560. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    561. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
          
  561. 
            
=======
          
  562. 
=======
          
  563. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  564. 
=======
          
  565. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  566. 
=======
          
  567. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  568. 
=======
          
  569. 
=======
          
  570. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  571. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  572. 
=======
          
  573. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
          
    574. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
  574. 
=======
=======
          
  575. 
=======
          
  576. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
  577. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
          
  578. 
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
  579. 
>>>>>>> 00f8b58 (Manifest_cache true)
            1
            

            

=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
    580. 
        
    
      
        
    
<<<<<<< HEAD
          
  580. 
=======
          
  581. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  582. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
          
    583. 
        
    
      
        
    
<<<<<<< HEAD
          
  583. 
=======
          
  584. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  585. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
          
    586. 
        
    
      
        
    
<<<<<<< HEAD
          
  586. 
=======
          
  587. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    588. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  588. 
            
=======
          
  589. 
=======
          
  590. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  591. 
=======
          
  592. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  593. 
=======
          
  594. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  595. 
=======
          
  596. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    597. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  597. 
            
=======
          
  598. 
=======
          
  599. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  600. 
=======
          
  601. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  602. 
=======
          
  603. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
          
    604. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
          
  604. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
  605. 
=======
          
  606. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  607. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  608. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  609. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            
<<<<<<< HEAD
=======
=======
          
  610. 
=======
          
  611. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  612. 
=======
          
  613. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  614. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  615. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  616. 
=======
          
  617. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  618. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
    619. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  619. 
=======
          
  620. 
=======
          
  621. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  622. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
          
  623. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 65f3409 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
          
    624. 
        
    
      
        
    
          
  624. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  625. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
  626. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
    627. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  627. 
=======
          
  628. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  629. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
    630. 
        
    
      
        
    
<<<<<<< HEAD
          
  630. 
=======
          
  631. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  632. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
          
    633. 
        
    
      
        
    
<<<<<<< HEAD
          
  633. 
=======
          
  634. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  635. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
          
    636. 
        
    
      
        
    
<<<<<<< HEAD
          
  636. 
=======
          
  637. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    638. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  638. 
            
=======
          
  639. 
=======
          
  640. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  641. 
=======
          
  642. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  643. 
=======
          
  644. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  645. 
=======
          
  646. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 864f339 (Featire specs)
              config.server_port = 3001
=======
=======
>>>>>>> a2de409 (Featire specs)
              config.default_driver = :rack_test
>>>>>>> b5f64c6 (Manifest_cache true)
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 864f339 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
          
    647. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  647. 
=======
          
  648. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  649. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  650. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  651. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  652. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
            end
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> b5f64c6 (Manifest_cache true)
          
    653. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
          
  653. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  654. 
=======
          
  655. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  656. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  657. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  658. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  659. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  660. 
>>>>>>> c033601 (Rebased)
            1
=======
          
  661. 
=======
          
  662. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  663. 
=======
          
  664. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 96aecde (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 3b03895 (Featire specs)
          
    665. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
          
  665. 
            
=======
          
  666. 
=======
          
  667. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  668. 
=======
          
  669. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  670. 
>>>>>>> 3b03895 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54ceb0 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
    671. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  671. 
            
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
          
  672. 
=======
=======
          
  673. 
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
  674. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  675. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
          
  676. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  677. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
          
  678. 
            
=======
          
  679. 
=======
          
  680. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  681. 
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7c4ea7f (Fix)
          
    682. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  682. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  683. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  684. 
>>>>>>> bf554f4 (Rebased)
=======
=======
          
  685. 
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
          
  686. 
=======
          
  687. 
<<<<<<< HEAD
>>>>>>> 866aee4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
          
    688. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
          
  688. 
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  689. 
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  690. 
>>>>>>> 866aee4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
          
    691. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
          
  691. 
>>>>>>> 845dac1 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
          
    692. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
  692. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  693. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  694. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  695. 
>>>>>>> bf554f4 (Rebased)
            1
=======
<<<<<<< HEAD
          
  696. 
            
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  697. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  698. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  699. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  700. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  701. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  702. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  703. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  704. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
          
  705. 
=======
          
  706. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
          
  707. 
=======
          
  708. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9dc109d (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
          
    709. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  709. 
            
=======
          
  710. 
=======
          
  711. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  712. 
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  713. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  714. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  715. 
=======
          
  716. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  717. 
            1
>>>>>>> 4552227 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
          
    718. 
        
    
      
        
    
<<<<<<< HEAD
          
  718. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 65f3409 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> d3d58e0 (Featire specs)
          
    719. 
        
    
      
        
    
          
  719. 
            1
            

            

              config.asset_host = 'http://localhost:3000'
          
    720. 
        
    
      
        
    
          
  720. 
            1
            

            

              config.default_max_wait_time = 5
          
    721. 
        
    
      
        
    
          
  721. 
            1
            

            

              config.server_port = 3001
          
    722. 
        
    
      
        
    
          
  722. 
            1
            

            

              config.default_driver = :rack_test
          
    723. 
        
    
      
        
    
          
  723. 
            1
            

            

              config.javascript_driver = :headless_chrome
          
    724. 
        
    
      
        
    
          
  724. 
            
            

            

            end
          
    725. 
        
    
      
        
    
          
  725. 
            
            

            

            
          
    726. 
        
    
      
        
    
          
  726. 
            1
            

            

            Capybara.register_driver :headless_chrome do |app|
          
    727. 
        
    
      
        
    
          
  727. 
            1
            

            

              client = Selenium::WebDriver::Remote::Http::Default.new
          
    728. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  728. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  729. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  730. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
<<<<<<< HEAD
          
  731. 
            1
=======
          
  732. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  733. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  734. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  735. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  736. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  737. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  738. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  739. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  740. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  741. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  742. 
            
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  743. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  744. 
            
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  745. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  746. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
          
  747. 
            
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  748. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  749. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
          
  750. 
            
>>>>>>> b8aab1a (Manifest_cache true)
=======
<<<<<<< HEAD
          
  751. 
            1
=======
          
  752. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  753. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  754. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  755. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  756. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  757. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  758. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  759. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  760. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  761. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  762. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  763. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  764. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  765. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  766. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  767. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  768. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  769. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  770. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  771. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  772. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  773. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  774. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  775. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  776. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  777. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  778. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  779. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  780. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  781. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  782. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  783. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  784. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  785. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1a9aba9 (Fix)
=======
          
  786. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  787. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  788. 
            1
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  789. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  790. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
          
  791. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  792. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
          
  793. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  794. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
          
  795. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  796. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  797. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  798. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  799. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  800. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  801. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  802. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  803. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
          
  804. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
          
  805. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
          
  806. 
            1
>>>>>>> 7c4ea7f (Fix)
=======
          
  807. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  808. 
            1
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  809. 
            
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  810. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              client.read_timeout = 150
          
    811. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  811. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  812. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  813. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
<<<<<<< HEAD
          
  814. 
            1
=======
          
  815. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  816. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  817. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  818. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  819. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  820. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  821. 
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  822. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  823. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  824. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  825. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  826. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  827. 
            
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  828. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  829. 
            
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  830. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  831. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
          
  832. 
            
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  833. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  834. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
          
  835. 
            
>>>>>>> b8aab1a (Manifest_cache true)
=======
<<<<<<< HEAD
          
  836. 
            1
=======
          
  837. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  838. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  839. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  840. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  841. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  842. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  843. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  844. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  845. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  846. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  847. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  848. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  849. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  850. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  851. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  852. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  853. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  854. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  855. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  856. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 23e9df9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  857. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  858. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  859. 
            
>>>>>>> bf554f4 (Rebased)
=======
          
  860. 
            1
>>>>>>> a5d032d (Fix)
=======
          
  861. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  862. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  863. 
            1
>>>>>>> 7c4ea7f (Fix)
=======
          
  864. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e3b70 (Fix)
=======
          
  865. 
            1
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
          
  866. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
  867. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  868. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
          
  869. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  870. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
          
  871. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
          
  872. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  873. 
            
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  874. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    875. 
        
    
      
        
    
>>>>>>> 8c32a77 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  875. 
            
=======
<<<<<<< HEAD
          
  876. 
            1
=======
          
  877. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  878. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  879. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  880. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  881. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  882. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  883. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  884. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  885. 
            1
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  886. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  887. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
=======
          
  888. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    889. 
        
    
      
        
    
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
          
  889. 
            
=======
<<<<<<< HEAD
          
  890. 
            1
=======
          
  891. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  892. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  893. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  894. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  895. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  896. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  897. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  898. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  899. 
            1
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  900. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  901. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  902. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
          
    903. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  903. 
            
=======
<<<<<<< HEAD
          
  904. 
            1
=======
          
  905. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  906. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  907. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  908. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  909. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  910. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  911. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  912. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  913. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  914. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  915. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  916. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  917. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  918. 
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  919. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
          
  920. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
          
  921. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  922. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  923. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  924. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  925. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  926. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  927. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1a9aba9 (Fix)
=======
          
  928. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  929. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  930. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  931. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    932. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  932. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> 02ba384 (Manifest_cache true)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 1830ff1 (Manifest_cache true)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  933. 
            
=======
<<<<<<< HEAD
          
  934. 
            1
=======
          
  935. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  936. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  937. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  938. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  939. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  940. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
          
  941. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  942. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  943. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  944. 
            
>>>>>>> caaaa41 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
          
  945. 
            1
>>>>>>> 83979de (Featire specs)
=======
          
  946. 
            
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  947. 
            1
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  948. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
          
  949. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  950. 
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  951. 
            1
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  952. 
            
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
            

            

>>>>>>> caaaa41 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
              options = ::Selenium::WebDriver::Chrome::Options.new
>>>>>>> 5506bd0 (Featire specs)
          
    953. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
          
  953. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> a9bf83f (Featire specs)
=======
          
  954. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
          
  955. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  956. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
          
  957. 
            
>>>>>>> d52ad35 (Rebased)
=======
          
  958. 
            1
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
          
  959. 
            1
>>>>>>> 93bdda9 (Featire specs)
=======
          
  960. 
            
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  961. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  962. 
            1
>>>>>>> 872e675 (Fix)
=======
          
  963. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
          
  964. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
  965. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
  966. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
  967. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
  968. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
  969. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    970. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  970. 
            1
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  971. 
            1
>>>>>>> 2a25e4c (Featire specs)
=======
          
  972. 
            
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  973. 
            
=======
<<<<<<< HEAD
          
  974. 
            1
=======
          
  975. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
          
  976. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  977. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  978. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  979. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  980. 
            
>>>>>>> 078304c (Rebased)
=======
          
  981. 
            1
>>>>>>> d15fe1d (Fix)
=======
          
  982. 
            
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
          
  983. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  984. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
          
  985. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  986. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
          
  987. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  988. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    989. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
  989. 
            
=======
          
  990. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  991. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 64d4167 (Featire specs)
=======
          
  992. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
          
  993. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
          
  994. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
          
  995. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    996. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  996. 
            1
=======
          
  997. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  998. 
            1
>>>>>>> 8c32a77 (Featire specs)
=======
          
  999. 
            
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  1000. 
            
=======
<<<<<<< HEAD
          
  1001. 
            1
=======
          
  1002. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  1003. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
          
  1004. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  1005. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  1006. 
            
>>>>>>> bebaea7 (Rebased)
=======
          
  1007. 
            1
>>>>>>> eaef86a (Fix)
=======
          
  1008. 
            
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  1009. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    1010. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
  1010. 
            
=======
          
  1011. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  1012. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1013. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  1014. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  1015. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
  1016. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
    1017. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
  1017. 
            
=======
          
  1018. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  1019. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1020. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  1021. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  1022. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
  1023. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
    1024. 
        
    
      
        
    
          
  1024. 
            1
            

            

              options.headless!
          
    1025. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
          
  1025. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1026. 
=======
          
  1027. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1028. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1029. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
          
  1030. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1031. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  1032. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
          
  1033. 
=======
          
  1034. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1035. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  1036. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  1037. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  1038. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  1039. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  1040. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1041. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1042. 
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  1043. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
          
  1044. 
=======
          
  1045. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  1046. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  1047. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  1048. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  1049. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  1050. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  1051. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
          
  1052. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  1053. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  1054. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  1055. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1056. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
          
  1057. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  1058. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  1059. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  1060. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  1061. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  1062. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  1063. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
          
  1064. 
=======
          
  1065. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  1066. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
          
  1067. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  1068. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
          
  1069. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  1070. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
          
  1071. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  1072. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
          
  1073. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  1074. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  1075. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  1076. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
          
  1077. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  1078. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  1079. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  1080. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
          
  1081. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  1082. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
          
  1083. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
          
  1084. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
          
  1085. 
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1086. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1087. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
          
  1088. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  1089. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  1090. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  1091. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  1092. 
=======
          
  1093. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  1094. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
          
  1095. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  1096. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  1097. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  1098. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
          
  1099. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  1100. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
          
  1101. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
          
  1102. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
          
  1103. 
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1104. 
=======
          
  1105. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
          
  1106. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
          
  1107. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
          
  1108. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
          
  1109. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
          
  1110. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
          
  1111. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
          
  1112. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
          
  1113. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
          
  1114. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
          
  1115. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

            
          
    1116. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1116. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1117. 
            
=======
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> b00b319 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> 394c6f3 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
>>>>>>> b763f5b (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 9dc109d (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
>>>>>>> 04108c4 (Manifest_cache true)
          
  1118. 
            1
=======
          
  1119. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  1120. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1121. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
          
  1122. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1123. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
          
  1124. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
          
  1125. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1126. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
          
  1127. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  1128. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
          
  1129. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
          
  1130. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  1131. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  1132. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  1133. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1134. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1135. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
          
  1136. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
          
  1137. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1138. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
          
  1139. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
          
  1140. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
          
  1141. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  1142. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  1143. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  1144. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  1145. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
          
  1146. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
          
  1147. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1148. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  1149. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  1150. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  1151. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
          
  1152. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
  1153. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1154. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  1155. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  1156. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  1157. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  1158. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1159. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  1160. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1161. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bebaea7 (Rebased)
=======
          
  1162. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> eaef86a (Fix)
=======
          
  1163. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
          
  1164. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
          
  1165. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  1166. 
            1
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1167. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  1168. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
=======
          
  1169. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1170. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  1171. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
          
  1172. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  1173. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  1174. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1175. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
          
  1176. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
          
  1177. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  1178. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  1179. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  1180. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1181. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  1182. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
          
  1183. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
          
  1184. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  1185. 
            1
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
          
  1186. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
          
  1187. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  1188. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              options.add_argument('--no-sandbox')
          
    1189. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1189. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1190. 
            
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> dcf74e1 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 5518ff0 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
>>>>>>> 04108c4 (Manifest_cache true)
          
  1191. 
            1
=======
          
  1192. 
            
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  1193. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1194. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1195. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1196. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1197. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  1198. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1199. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1200. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1201. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1202. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1203. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1204. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1205. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  1206. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1207. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1208. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1209. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1210. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  1211. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
          
  1212. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  1213. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  1214. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  1215. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  1216. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  1217. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  1218. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  1219. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  1220. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  1221. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  1222. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  1223. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  1224. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1225. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  1226. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  1227. 
            1
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1228. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  1229. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  1230. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  1231. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  1232. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  1233. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  1234. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  1235. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  1236. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  1237. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1238. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  1239. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  1240. 
            1
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  1241. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  1242. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              options.add_argument('--disable-dev-shm-usage')
          
    1243. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1243. 
            
=======
<<<<<<< HEAD
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
          
  1244. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
  1245. 
            
=======
<<<<<<< HEAD
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  1246. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
          
  1247. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  1248. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1249. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1250. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1251. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1252. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  1253. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1254. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1255. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  1256. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  1257. 
            
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
          
  1258. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 3fef583 (Manifest_cache true)
          
  1259. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
          
  1260. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
          
  1261. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 93db8b1 (Featire specs)
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  1262. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> b746b60 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  1263. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 5f76842 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  1264. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e965665 (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  1265. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> ea0650c (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  1266. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 10b6c72 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  1267. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  1268. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  1269. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  1270. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  1271. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1272. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1273. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  1274. 
            1
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1275. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1276. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1277. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1278. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  1279. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  1280. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  1281. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1282. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  1283. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  1284. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b5b269 (Fix)
=======
          
  1285. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1286. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  1287. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1288. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  1289. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1290. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  1291. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1292. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 20256f8 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1293. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  1294. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1295. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bebaea7 (Rebased)
=======
          
  1296. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> eaef86a (Fix)
=======
          
  1297. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
          
  1298. 
            
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  1299. 
            1
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1300. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  1301. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  1302. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1303. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  1304. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  1305. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
          
  1306. 
            1
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1307. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  1308. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              options.add_argument('--window-size=1400,1400')
          
    1309. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1309. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1310. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  1311. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
<<<<<<< HEAD
          
  1312. 
            1
=======
          
  1313. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  1314. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1315. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1316. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1317. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1318. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  1319. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1320. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1321. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  1322. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  1323. 
            
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  1324. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  1325. 
            
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  1326. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  1327. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
          
  1328. 
            
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  1329. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  1330. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
          
  1331. 
            
>>>>>>> b8aab1a (Manifest_cache true)
=======
<<<<<<< HEAD
          
  1332. 
            1
=======
          
  1333. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1334. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  1335. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1336. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  1337. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1338. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  1339. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1340. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1341. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  1342. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1343. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1344. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1345. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  1346. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1347. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  1348. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
          
  1349. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  1350. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  1351. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  1352. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  1353. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  1354. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  1355. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  1356. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  1357. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  1358. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  1359. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  1360. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  1361. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  1362. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  1363. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  1364. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  1365. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1366. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  1367. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  1368. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  1369. 
            1
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1370. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  1371. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
          
  1372. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  1373. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
          
  1374. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  1375. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
          
  1376. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  1377. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  1378. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  1379. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  1380. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  1381. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  1382. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  1383. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1384. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  1385. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  1386. 
            1
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  1387. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  1388. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1389. 
            
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  1390. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              options.add_argument('--allow-insecure-localhost')
          
    1391. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1391. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1392. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  1393. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
<<<<<<< HEAD
          
  1394. 
            1
=======
          
  1395. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  1396. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1397. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1398. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1399. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1400. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  1401. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1402. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1403. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  1404. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  1405. 
            
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  1406. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  1407. 
            
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  1408. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  1409. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
          
  1410. 
            
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  1411. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  1412. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
          
  1413. 
            
>>>>>>> b8aab1a (Manifest_cache true)
=======
<<<<<<< HEAD
          
  1414. 
            1
=======
          
  1415. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1416. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  1417. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1418. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  1419. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1420. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  1421. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1422. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1423. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  1424. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1425. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1426. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1427. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  1428. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1429. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  1430. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
          
  1431. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  1432. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  1433. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  1434. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  1435. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  1436. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  1437. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  1438. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  1439. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  1440. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  1441. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  1442. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  1443. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  1444. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  1445. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
          
  1446. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  1447. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1448. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  1449. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  1450. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
          
  1451. 
            1
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1452. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  1453. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
          
  1454. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
          
  1455. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
          
  1456. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
          
  1457. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
          
  1458. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  1459. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  1460. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  1461. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  1462. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  1463. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  1464. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
          
  1465. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1466. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  1467. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
          
  1468. 
            1
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  1469. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  1470. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1471. 
            
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  1472. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
          
    1473. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1473. 
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1474. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
          
  1475. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
<<<<<<< HEAD
          
  1476. 
            1
=======
          
  1477. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  1478. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1479. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1480. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1481. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1482. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
          
  1483. 
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  1484. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1485. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1486. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1487. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  1488. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  1489. 
            
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  1490. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
  1491. 
            
>>>>>>> ee5935f (Manifest_cache true)
=======
          
  1492. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  1493. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
=======
          
  1494. 
            
>>>>>>> 0c9131d (Manifest_cache true)
=======
          
  1495. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
  1496. 
            
>>>>>>> 4e7b845 (Manifest_cache true)
=======
          
  1497. 
            
>>>>>>> b8aab1a (Manifest_cache true)
=======
<<<<<<< HEAD
          
  1498. 
            1
=======
          
  1499. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  1500. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
  1501. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1502. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
  1503. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1504. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  1505. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1506. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1507. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1508. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1509. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
  1510. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1511. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  1512. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  1513. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
          
  1514. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  1515. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  1516. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  1517. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  1518. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 23e9df9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
          
  1519. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
          
  1520. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1521. 
            
>>>>>>> bf554f4 (Rebased)
=======
          
  1522. 
            1
>>>>>>> a5d032d (Fix)
=======
          
  1523. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1524. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1525. 
            1
>>>>>>> 7c4ea7f (Fix)
=======
          
  1526. 
            
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e3b70 (Fix)
=======
          
  1527. 
            1
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
          
  1528. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
  1529. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  1530. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
          
  1531. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  1532. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
=======
          
  1533. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
          
  1534. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 4e7b845 (Manifest_cache true)
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1535. 
            
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
          
  1536. 
            1
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1537. 
        
    
      
        
    
>>>>>>> 8c32a77 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  1537. 
            
=======
<<<<<<< HEAD
          
  1538. 
            1
=======
          
  1539. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  1540. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1541. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1542. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1543. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1544. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  1545. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1546. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1547. 
            1
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  1548. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  1549. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
=======
          
  1550. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1551. 
        
    
      
        
    
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
          
  1551. 
            
=======
<<<<<<< HEAD
          
  1552. 
            1
=======
          
  1553. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  1554. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1555. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1556. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1557. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1558. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  1559. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1560. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  1561. 
            1
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  1562. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  1563. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  1564. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
          
    1565. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1565. 
            
=======
<<<<<<< HEAD
          
  1566. 
            1
=======
          
  1567. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  1568. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1569. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1570. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1571. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1572. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  1573. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1574. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  1575. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  1576. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  1577. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  1578. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  1579. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1580. 
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  1581. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
=======
          
  1582. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
          
  1583. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  1584. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1585. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  1586. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  1587. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
          
  1588. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1589. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1a9aba9 (Fix)
=======
          
  1590. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1591. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  1592. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  1593. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> eaef86a (Fix)
=======
>>>>>>> 1a9aba9 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1594. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1594. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
>>>>>>> 02ba384 (Manifest_cache true)
=======
>>>>>>> fd3e35e (Featire specs)
=======
>>>>>>> 926dfe5 (Manifest_cache true)
=======
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1677b1a (Featire specs)
=======
>>>>>>> 1830ff1 (Manifest_cache true)
=======
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
  1595. 
            
=======
<<<<<<< HEAD
          
  1596. 
            1
=======
          
  1597. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
  1598. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1599. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1600. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1601. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1602. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
          
  1603. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1604. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1605. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  1606. 
            
>>>>>>> caaaa41 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
          
  1607. 
            1
>>>>>>> 83979de (Featire specs)
=======
          
  1608. 
            
>>>>>>> d0f5c14 (Manifest_cache true)
=======
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  1609. 
            1
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  1610. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
          
  1611. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1612. 
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  1613. 
            1
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  1614. 
            
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
            

            

>>>>>>> caaaa41 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
              options.add_argument('--ignore-certificate-errors=true')
>>>>>>> 5506bd0 (Featire specs)
          
    1615. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
          
  1615. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> a9bf83f (Featire specs)
=======
          
  1616. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
          
  1617. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  1618. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
          
  1619. 
            
>>>>>>> d52ad35 (Rebased)
=======
          
  1620. 
            1
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
          
  1621. 
            1
>>>>>>> 93bdda9 (Featire specs)
=======
          
  1622. 
            
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
  1623. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  1624. 
            1
>>>>>>> 872e675 (Fix)
=======
          
  1625. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
          
  1626. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
  1627. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
  1628. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
  1629. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
  1630. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
  1631. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1632. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1632. 
            1
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 836a973 (Rebased)
=======
          
  1633. 
            1
>>>>>>> 2a25e4c (Featire specs)
=======
          
  1634. 
            
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
          
  1635. 
            
=======
<<<<<<< HEAD
          
  1636. 
            1
=======
          
  1637. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
          
  1638. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  1639. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
          
  1640. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  1641. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
          
  1642. 
            
>>>>>>> 078304c (Rebased)
=======
          
  1643. 
            1
>>>>>>> d15fe1d (Fix)
=======
          
  1644. 
            
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
          
  1645. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  1646. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
          
  1647. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  1648. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
          
  1649. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  1650. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1651. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
  1651. 
            
=======
          
  1652. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  1653. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 64d4167 (Featire specs)
=======
          
  1654. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
          
  1655. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
          
  1656. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
          
  1657. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1658. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1658. 
            1
=======
          
  1659. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1577aeb (Rebased)
=======
          
  1660. 
            1
>>>>>>> 8c32a77 (Featire specs)
=======
          
  1661. 
            
>>>>>>> 902b803 (Manifest_cache true)
=======
          
  1662. 
            
=======
<<<<<<< HEAD
          
  1663. 
            1
=======
          
  1664. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
          
  1665. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
          
  1666. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  1667. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
          
  1668. 
            
>>>>>>> bebaea7 (Rebased)
=======
          
  1669. 
            1
>>>>>>> eaef86a (Fix)
=======
          
  1670. 
            
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  1671. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1672. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
  1672. 
            
=======
          
  1673. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  1674. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1675. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  1676. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  1677. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
  1678. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
          
    1679. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
  1679. 
            
=======
          
  1680. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
  1681. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  1682. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
  1683. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
  1684. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
  1685. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
              options.add_argument('--ignore-certificate-errors=true')
          
    1686. 
        
    
      
        
    
          
  1686. 
            1
            

            

              options.add_argument('--accept-insecure-certs=true')
          
    1687. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
          
  1687. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1688. 
=======
          
  1689. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1690. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  1691. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
          
  1692. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1693. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  1694. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
          
  1695. 
=======
          
  1696. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1697. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  1698. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  1699. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  1700. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  1701. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  1702. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1703. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1704. 
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  1705. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
          
  1706. 
=======
          
  1707. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  1708. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  1709. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  1710. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  1711. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  1712. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  1713. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
          
  1714. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  1715. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  1716. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  1717. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1718. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
          
  1719. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  1720. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  1721. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  1722. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  1723. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  1724. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  1725. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
          
  1726. 
=======
          
  1727. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  1728. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
          
  1729. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  1730. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
          
  1731. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  1732. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
          
  1733. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  1734. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
          
  1735. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  1736. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  1737. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  1738. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
          
  1739. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  1740. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  1741. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  1742. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
          
  1743. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  1744. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
          
  1745. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
          
  1746. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
          
  1747. 
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1748. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1749. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
          
  1750. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  1751. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  1752. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  1753. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  1754. 
=======
          
  1755. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  1756. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
          
  1757. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  1758. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  1759. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  1760. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
          
  1761. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  1762. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
          
  1763. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
          
  1764. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
          
  1765. 
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1766. 
=======
          
  1767. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
          
  1768. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
          
  1769. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
          
  1770. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
          
  1771. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
          
  1772. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
          
  1773. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
          
  1774. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
          
  1775. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
          
  1776. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
          
  1777. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

            
          
    1778. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> ee5935f (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> d15fe1d (Fix)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> d66884b (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> eaef86a (Fix)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 3dc272d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
          
  1778. 
            
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 864f339 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c1749d5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebe5361 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
>>>>>>> b763f5b (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
>>>>>>> 04108c4 (Manifest_cache true)
          
  1779. 
=======
          
  1780. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
            1
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7945032 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
          
  1781. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> b00b319 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
          
  1782. 
=======
          
  1783. 
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
            1
=======
          
  1784. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 3fef583 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> 04108c4 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  1785. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1786. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
          
  1787. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
          
  1788. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 8577deb (Featire specs)
=======
          
  1789. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> d96cf3b (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
          
  1790. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
          
  1791. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 1ac6be1 (Fix)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
  1792. 
=======
          
  1793. 
>>>>>>> d0dc1f1 (Featire specs)
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f764a87 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 9dc109d (Featire specs)
          
  1794. 
=======
          
  1795. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d780a52 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0f5c14 (Manifest_cache true)
=======
=======
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cfd1f7f (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> c1749d5 (Featire specs)
=======
          
  1796. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e031bce (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 12bcf81 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02ba384 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3e35e (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 926dfe5 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c54769d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
          
  1797. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1677b1a (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
  1798. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1830ff1 (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1799. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c346782 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  1800. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52ad35 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
=======
          
  1801. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0bdcc5e (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
  1802. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
          
  1803. 
=======
          
  1804. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1805. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1806. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
  1807. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
=======
          
  1808. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
          
  1809. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> d1bae53 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9620751 (Featire specs)
          
  1810. 
=======
          
  1811. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 9dc109d (Featire specs)
          
  1812. 
=======
          
  1813. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ee5935f (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 864f339 (Featire specs)
=======
          
  1814. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1815. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
          
  1816. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65f3409 (Featire specs)
          
  1817. 
=======
          
  1818. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d755be3 (Fix book_spec decrease quantity and price)
=======
=======
          
  1819. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  1820. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> d15fe1d (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d66884b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
  1821. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
          
  1822. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8879e8b (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> ebe5361 (Featire specs)
=======
          
  1823. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1173b70 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1824. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  1825. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
=======
          
  1826. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
=======
=======
          
  1827. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4e0a8d9 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> da83d1a (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2a431e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e733663 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1828. 
            
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
=======
=======
          
  1829. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0c9131d (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1830. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1831. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
          
  1832. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
=======
          
  1833. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
=======
=======
          
  1834. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  1835. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> eaef86a (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 75be480 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
=======
          
  1836. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
          
  1837. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 128e4ae (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
          
  1838. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  1839. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
  1840. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 05602ed (Fix book_spec decrease quantity and price)
=======
=======
          
  1841. 
            1
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1a9aba9 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 4e7b845 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3fef583 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 3c67c09 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b90c395 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4eeb340 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 574967f (Fix book_spec decrease quantity and price)
>>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 04108c4 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 45f6de0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
          
  1842. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a455e8a (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7718476 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1843. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
>>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> cea736b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

              Capybara::Selenium::Driver.new(
          
    1844. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 848bfa2 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> cae047f (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> fefbd35 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
>>>>>>> 95ebdc2 (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 3b839af (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
>>>>>>> 5a0bcc7 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 0832698 (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
          
  1844. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
          
  1845. 
=======
          
  1846. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1847. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  1848. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  1849. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> bcd09ab (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c006a44 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> 866aee4 (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
>>>>>>> 864f339 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
>>>>>>> b5f64c6 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
>>>>>>> a2de409 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> fe7e312 (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
          
  1850. 
=======
          
  1851. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 6edce20 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1852. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
  1853. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> d8298a1 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
  1854. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  1855. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> bdea3aa (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  1856. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  1857. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  1858. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> e2d040a (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1859. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1860. 
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
=======
          
  1861. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
  1862. 
=======
          
  1863. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  1864. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  1865. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  1866. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  1867. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  1868. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  1869. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  1870. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
          
  1871. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  1872. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  1873. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
  1874. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1875. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
=======
          
  1876. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
=======
          
  1877. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
=======
          
  1878. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5be567f (Featire specs)
=======
=======
=======
          
  1879. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  1880. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  1881. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  1882. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
          
  1883. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
          
  1884. 
=======
          
  1885. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
=======
          
  1886. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
=======
          
  1887. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
=======
          
  1888. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
=======
          
  1889. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
=======
          
  1890. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
=======
          
  1891. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
=======
          
  1892. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
=======
          
  1893. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
=======
          
  1894. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
=======
          
  1895. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a9e654b (Manifest_cache true)
=======
=======
          
  1896. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> d6f7da8 (Featire specs)
=======
=======
=======
          
  1897. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
=======
          
  1898. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> f5da5ac (Featire specs)
=======
=======
=======
          
  1899. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
=======
          
  1900. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f79779 (Featire specs)
=======
=======
=======
          
  1901. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56a05fb (Featire specs)
=======
=======
=======
          
  1902. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
=======
          
  1903. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6d21330 (Featire specs)
=======
=======
=======
          
  1904. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
=======
          
  1905. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 27e3351 (Featire specs)
=======
=======
=======
          
  1906. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b40a04e (Manifest_cache true)
=======
=======
          
  1907. 
>>>>>>> 8f1bc14 (Fix)
>>>>>>> 1ac6be1 (Fix)
=======
          
  1908. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1909. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
=======
          
  1910. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
=======
          
  1911. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
=======
          
  1912. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
=======
          
  1913. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
          
  1914. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
=======
          
  1915. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  1916. 
=======
          
  1917. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9dc109d (Featire specs)
<<<<<<< HEAD
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
          
  1918. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
=======
          
  1919. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 864f339 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93db8b1 (Featire specs)
=======
=======
=======
          
  1920. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b5f64c6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
=======
          
  1921. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5f76842 (Featire specs)
=======
=======
=======
          
  1922. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e965665 (Manifest_cache true)
=======
=======
>>>>>>> e54ceb0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ea0650c (Featire specs)
=======
=======
=======
          
  1923. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
=======
          
  1924. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
<<<<<<< HEAD
>>>>>>> a038b16 (Featire specs)
=======
=======
=======
          
  1925. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
=======
          
  1926. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
<<<<<<< HEAD
>>>>>>> d7fadcd (Featire specs)
=======
=======
=======
          
  1927. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 39467b5 (Manifest_cache true)
=======
=======
          
  1928. 
>>>>>>> 8f1bc14 (Fix)
<<<<<<< HEAD
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  1929. 
=======
          
  1930. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 65f3409 (Featire specs)
<<<<<<< HEAD
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
          
  1931. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
=======
          
  1932. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c1749d5 (Featire specs)
<<<<<<< HEAD
>>>>>>> f861b82 (Featire specs)
=======
=======
=======
          
  1933. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 3c386ca (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
=======
          
  1934. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2fd2048 (Featire specs)
=======
=======
=======
          
  1935. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
>>>>>>> 8577deb (Featire specs)
<<<<<<< HEAD
>>>>>>> bc0ff2c (Featire specs)
=======
=======
=======
          
  1936. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
=======
          
  1937. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bf2aae (Featire specs)
=======
=======
=======
          
  1938. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
=======
          
  1939. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
=======
          
  1940. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307ac6e (Manifest_cache true)
=======
=======
          
  1941. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

                app,
          
    1942. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
          
  1942. 
            
            

            

                browser: :chrome,
          
    1943. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> a9bf83f (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> b459807 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 113da87 (Featire specs)
          
  1943. 
=======
>>>>>>> 93bdda9 (Featire specs)
          
  1944. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  1945. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  1946. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1947. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1948. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1949. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1950. 
>>>>>>> 08edf50 (Featire specs)
=======
          
  1951. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1952. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
  1953. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bf554f4 (Rebased)
          
  1954. 
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
          
  1955. 
=======
          
  1956. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
  1957. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
          
  1958. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
  1959. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
  1960. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
  1961. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
  1962. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
  1963. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
  1964. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
          
  1965. 
>>>>>>> 1d59aaa (Fix)
=======
          
  1966. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                browser: :chrome,
=======
                http_client: client,
>>>>>>> cde4834 (Manifest_cache true)
          
    1967. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 8874887 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
          
  1967. 
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1968. 
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
          
  1969. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bebee5 (Manifest_cache true)
=======
=======
          
  1970. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  1971. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  1972. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  1973. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  1974. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  1975. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  1976. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
          
  1977. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
          
  1978. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  1979. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
          
  1980. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  1981. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
          
  1982. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  1983. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
          
  1984. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  1985. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
          
  1986. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  1987. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  1988. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> d6f7da8 (Featire specs)
=======
=======
          
  1989. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
          
  1990. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f5da5ac (Featire specs)
=======
=======
          
  1991. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
          
  1992. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
=======
=======
          
  1993. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
          
  1994. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 56a05fb (Featire specs)
=======
=======
          
  1995. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
          
  1996. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 6d21330 (Featire specs)
=======
=======
          
  1997. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
          
  1998. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  1999. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
          
  2000. 
>>>>>>> cde4834 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                browser: :chrome,
          
    2001. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> 587ce47 (Manifest_cache true)
          
  2001. 
=======
>>>>>>> 8c32a77 (Featire specs)
          
  2002. 
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
          
  2003. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
=======
          
  2004. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  2005. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  2006. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  2007. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
          
  2008. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  2009. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  2010. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
          
  2011. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  2012. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
          
  2013. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  2014. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  2015. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  2016. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  2017. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  2018. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
          
  2019. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  2020. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  2021. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
          
  2022. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  2023. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  2024. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
          
  2025. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
          
  2026. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
          
  2027. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
          
  2028. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
          
  2029. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
          
  2030. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
          
  2031. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
          
  2032. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  2033. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
          
  2034. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  2035. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  2036. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  2037. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
          
  2038. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  2039. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
          
  2040. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  2041. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
          
  2042. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
          
  2043. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
          
  2044. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  2045. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
          
  2046. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  2047. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

                browser: :chrome,
          
    2048. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  2048. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                http_client: client,
>>>>>>> bebaea7 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> 1577aeb (Rebased)
                http_client: client,
>>>>>>> 078304c (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> 836a973 (Rebased)
                http_client: client,
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
                http_client: client,
<<<<<<< HEAD
=======
                http_client: client,
>>>>>>> df37394 (Featire specs)
=======
                http_client: client,
>>>>>>> 715fac2 (Featire specs)
=======
                http_client: client,
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 3dc272d (Featire specs)
              )
=======
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
                http_client: client,
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
                http_client: client,
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 078304c (Rebased)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
                http_client: client,
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> bebaea7 (Rebased)
          
    2049. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
          
  2049. 
=======
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> b763f5b (Manifest_cache true)
<<<<<<< HEAD
          
  2050. 
=======
          
  2051. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  2052. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2053. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  2054. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b00b319 (Manifest_cache true)
=======
=======
          
  2055. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9bf83f (Featire specs)
=======
=======
          
  2056. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
  2057. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
          
  2058. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b459807 (Manifest_cache true)
=======
=======
          
  2059. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
          
  2060. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2ba25f7 (Manifest_cache true)
=======
          
  2061. 
>>>>>>> 49e8a6c (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
  2062. 
<<<<<<< HEAD
=======
          
  2063. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
  2064. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
          
  2065. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
  2066. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
  2067. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
  2068. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
  2069. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
  2070. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
  2071. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
  2072. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
  2073. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
  2074. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 394c6f3 (Manifest_cache true)
=======
=======
          
  2075. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5be567f (Featire specs)
=======
=======
          
  2076. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
  2077. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  2078. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> caaaa41 (Manifest_cache true)
=======
=======
          
  2079. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
  2080. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8874887 (Manifest_cache true)
=======
=======
>>>>>>> b4763a2 (Featire specs)
=======
>>>>>>> dcf74e1 (Manifest_cache true)
=======
>>>>>>> bcd09ab (Featire specs)
=======
>>>>>>> 022e63e (Manifest_cache true)
=======
>>>>>>> c006a44 (Featire specs)
=======
>>>>>>> 10bdfea (Manifest_cache true)
=======
>>>>>>> 848bfa2 (Featire specs)
=======
>>>>>>> d70f030 (Manifest_cache true)
=======
>>>>>>> 9ca3b84 (Featire specs)
=======
>>>>>>> cae047f (Manifest_cache true)
=======
>>>>>>> fefbd35 (Featire specs)
=======
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
>>>>>>> d6f7da8 (Featire specs)
=======
>>>>>>> ab67c96 (Manifest_cache true)
=======
>>>>>>> f5da5ac (Featire specs)
=======
>>>>>>> 036bb32 (Manifest_cache true)
=======
>>>>>>> 5f79779 (Featire specs)
=======
>>>>>>> 3e8974a (Manifest_cache true)
=======
>>>>>>> 56a05fb (Featire specs)
=======
>>>>>>> 23e9df9 (Manifest_cache true)
=======
>>>>>>> 6d21330 (Featire specs)
=======
>>>>>>> 9617beb (Manifest_cache true)
=======
>>>>>>> 27e3351 (Featire specs)
=======
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> 6edce20 (Manifest_cache true)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d8298a1 (Manifest_cache true)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bdea3aa (Manifest_cache true)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 07682bd (Manifest_cache true)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> e2d040a (Manifest_cache true)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> c1749d5 (Featire specs)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
          
  2081. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 078304c (Rebased)
=======
=======
          
  2082. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b4763a2 (Featire specs)
=======
=======
          
  2083. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dcf74e1 (Manifest_cache true)
=======
=======
          
  2084. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bcd09ab (Featire specs)
=======
=======
          
  2085. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 022e63e (Manifest_cache true)
=======
=======
          
  2086. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c006a44 (Featire specs)
=======
=======
          
  2087. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 10bdfea (Manifest_cache true)
=======
=======
          
  2088. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 848bfa2 (Featire specs)
=======
=======
          
  2089. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d70f030 (Manifest_cache true)
=======
=======
          
  2090. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ca3b84 (Featire specs)
=======
=======
          
  2091. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cae047f (Manifest_cache true)
=======
=======
          
  2092. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fefbd35 (Featire specs)
=======
=======
          
  2093. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> a9e654b (Manifest_cache true)
=======
>>>>>>> 0b5b269 (Fix)
=======
=======
          
  2094. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> d6f7da8 (Featire specs)
=======
=======
          
  2095. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> ab67c96 (Manifest_cache true)
=======
=======
          
  2096. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f5da5ac (Featire specs)
=======
=======
          
  2097. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 036bb32 (Manifest_cache true)
=======
=======
          
  2098. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f79779 (Featire specs)
=======
=======
          
  2099. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 3e8974a (Manifest_cache true)
=======
=======
          
  2100. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 56a05fb (Featire specs)
=======
=======
          
  2101. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 23e9df9 (Manifest_cache true)
=======
=======
          
  2102. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 6d21330 (Featire specs)
=======
=======
          
  2103. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 9617beb (Manifest_cache true)
=======
=======
          
  2104. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 27e3351 (Featire specs)
=======
=======
          
  2105. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b40a04e (Manifest_cache true)
=======
>>>>>>> 1ac6be1 (Fix)
=======
>>>>>>> b763f5b (Manifest_cache true)
=======
=======
          
  2106. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  2107. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> be2f578 (Manifest_cache true)
=======
=======
          
  2108. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8b420cf (Featire specs)
=======
=======
          
  2109. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> ed97c39 (Manifest_cache true)
=======
=======
          
  2110. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
=======
          
  2111. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 587ce47 (Manifest_cache true)
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> 5518ff0 (Manifest_cache true)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 027f794 (Manifest_cache true)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> e2bfd89 (Manifest_cache true)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> d1bae53 (Manifest_cache true)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 35d9b13 (Manifest_cache true)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 459d812 (Manifest_cache true)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> b746b60 (Manifest_cache true)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> e965665 (Manifest_cache true)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> 10b6c72 (Manifest_cache true)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> a77cc8a (Manifest_cache true)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> 864f339 (Featire specs)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 8f1bc14 (Fix)
          
  2112. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
          
  2113. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b35d1f8 (Featire specs)
=======
=======
          
  2114. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5518ff0 (Manifest_cache true)
=======
=======
          
  2115. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  2116. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 027f794 (Manifest_cache true)
=======
=======
          
  2117. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  2118. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e2bfd89 (Manifest_cache true)
=======
=======
          
  2119. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
          
  2120. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d1bae53 (Manifest_cache true)
=======
=======
          
  2121. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  2122. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d9b13 (Manifest_cache true)
=======
=======
          
  2123. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
=======
          
  2124. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> f7f7abc (Manifest_cache true)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
          
  2125. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
          
  2126. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 459d812 (Manifest_cache true)
=======
=======
          
  2127. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
          
  2128. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> b746b60 (Manifest_cache true)
=======
=======
          
  2129. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
          
  2130. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e965665 (Manifest_cache true)
=======
=======
          
  2131. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
          
  2132. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 10b6c72 (Manifest_cache true)
=======
=======
          
  2133. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  2134. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> a77cc8a (Manifest_cache true)
=======
=======
          
  2135. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
          
  2136. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 39467b5 (Manifest_cache true)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
          
  2137. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  2138. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 6edce20 (Manifest_cache true)
=======
=======
          
  2139. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  2140. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d8298a1 (Manifest_cache true)
=======
=======
          
  2141. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  2142. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> bdea3aa (Manifest_cache true)
=======
=======
          
  2143. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
          
  2144. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 07682bd (Manifest_cache true)
=======
=======
          
  2145. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  2146. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> e2d040a (Manifest_cache true)
=======
=======
          
  2147. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
          
  2148. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 307ac6e (Manifest_cache true)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b00b319 (Manifest_cache true)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 394c6f3 (Manifest_cache true)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> b763f5b (Manifest_cache true)
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
                http_client: client,
>>>>>>> c033601 (Rebased)
          
    2149. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
          
  2149. 
=======
          
  2150. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2151. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2152. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  2153. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  2154. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  2155. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                options: options
=======
<<<<<<< HEAD
                options: options
>>>>>>> df37394 (Featire specs)
=======
                options: options
>>>>>>> 715fac2 (Featire specs)
=======
                options: options
>>>>>>> 3dc272d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                options: options
>>>>>>> c033601 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
                options: options
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
                options: options
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
                options: options
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
=======
=======
                options: options
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
          
    2156. 
        
    
      
        
    
          
  2156. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 3dc272d (Featire specs)
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> 1577aeb (Rebased)
=======
>>>>>>> c033601 (Rebased)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
    2157. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 902b803 (Manifest_cache true)
          
  2157. 
=======
          
  2158. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2159. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2160. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
  2161. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 7945032 (Manifest_cache true)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
  2162. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 9bebee5 (Manifest_cache true)
=======
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  2163. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 902b803 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
    2164. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  2164. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
          
  2165. 
=======
          
  2166. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  2167. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2168. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2169. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  2170. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  2171. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  2172. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  2173. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  2174. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  2175. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  2176. 
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
    2177. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2177. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
          
  2178. 
=======
          
  2179. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2180. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2181. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  2182. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  2183. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  2184. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  2185. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  2186. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  2187. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  2188. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  2189. 
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  2190. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  2191. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  2192. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  2193. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  2194. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  2195. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  2196. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  2197. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  2198. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  2199. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> ee78f39 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> 836a973 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 3dc272d (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
    2200. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2200. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
          
  2201. 
=======
          
  2202. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2203. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2204. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  2205. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  2206. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  2207. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  2208. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  2209. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  2210. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  2211. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  2212. 
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  2213. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  2214. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  2215. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  2216. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  2217. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  2218. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  2219. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  2220. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  2221. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  2222. 
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
          
  2223. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
=======
          
  2224. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
          
  2225. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
=======
          
  2226. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
          
  2227. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
=======
          
  2228. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
          
  2229. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
=======
=======
          
  2230. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
=======
          
  2231. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  2232. 
>>>>>>> 8f1bc14 (Fix)
=======
          
  2233. 
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> 56ef3ac (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 836a973 (Rebased)
=======
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 1577aeb (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
              )
          
    2234. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2234. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 9dc109d (Featire specs)
=======
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
>>>>>>> a2de409 (Featire specs)
=======
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
>>>>>>> e54ceb0 (Featire specs)
=======
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
>>>>>>> 95ebdc2 (Featire specs)
=======
>>>>>>> 3b839af (Manifest_cache true)
=======
>>>>>>> 5a0bcc7 (Featire specs)
=======
>>>>>>> 0832698 (Manifest_cache true)
=======
>>>>>>> 65f3409 (Featire specs)
=======
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
>>>>>>> 1cb2e82 (Featire specs)
=======
>>>>>>> fe7e312 (Manifest_cache true)
=======
>>>>>>> 8577deb (Featire specs)
=======
>>>>>>> 94d9078 (Manifest_cache true)
=======
>>>>>>> ebe5361 (Featire specs)
=======
>>>>>>> 2956182 (Manifest_cache true)
=======
>>>>>>> d3d58e0 (Featire specs)
=======
>>>>>>> 9d9ff14 (Manifest_cache true)
          
  2235. 
=======
          
  2236. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2237. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  2238. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  2239. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
  2240. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  2241. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
  2242. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  2243. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
  2244. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  2245. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
  2246. 
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  2247. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
  2248. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
  2249. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
  2250. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
          
  2251. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
  2252. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  2253. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
  2254. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  2255. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
  2256. 
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 9dc109d (Featire specs)
=======
=======
          
  2257. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 866aee4 (Manifest_cache true)
=======
>>>>>>> b5f64c6 (Manifest_cache true)
=======
=======
          
  2258. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> a2de409 (Featire specs)
=======
=======
          
  2259. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 8c7bad7 (Manifest_cache true)
=======
=======
          
  2260. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54ceb0 (Featire specs)
=======
=======
          
  2261. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 1bfc7a6 (Manifest_cache true)
=======
=======
          
  2262. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 95ebdc2 (Featire specs)
=======
=======
          
  2263. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 3b839af (Manifest_cache true)
=======
=======
          
  2264. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5a0bcc7 (Featire specs)
=======
=======
          
  2265. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 0832698 (Manifest_cache true)
=======
          
  2266. 
>>>>>>> 8f1bc14 (Fix)
=======
>>>>>>> 65f3409 (Featire specs)
=======
=======
          
  2267. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e991554 (Manifest_cache true)
=======
>>>>>>> 3c386ca (Manifest_cache true)
=======
=======
          
  2268. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 1cb2e82 (Featire specs)
=======
=======
          
  2269. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fe7e312 (Manifest_cache true)
=======
=======
          
  2270. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8577deb (Featire specs)
=======
=======
          
  2271. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 94d9078 (Manifest_cache true)
=======
=======
          
  2272. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ebe5361 (Featire specs)
=======
=======
          
  2273. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2956182 (Manifest_cache true)
=======
=======
          
  2274. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d3d58e0 (Featire specs)
=======
=======
          
  2275. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 9d9ff14 (Manifest_cache true)
=======
          
  2276. 
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3dc272d (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 1577aeb (Rebased)
            end
          
    2277.

spec/support/configs/shoulda_matcher.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            Shoulda::Matchers.configure do |config|
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.integrate do |with|
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

                with.test_framework :rspec
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8c32a77 (Featire specs)
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  5. 
            1
=======
          
  6. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  7. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
          
  8. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
          
  9. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
          
  10. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
          
  11. 
            1
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  12. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fd74f (Featire specs)
=======
          
  13. 
            1
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
          
  14. 
            1
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  15. 
            1
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            

            

                with.library :active_record
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                # Keep as many of these lines as are necessary:
>>>>>>> cde4834 (Manifest_cache true)
          
    16. 
        
    
      
        
    
          
  16. 
=======
          
  17. 
>>>>>>> 1577aeb (Rebased)
            1
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 8c32a77 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8c32a77 (Featire specs)
                with.library :active_record
=======
                # Keep as many of these lines as are necessary:
>>>>>>> d0dc1f1 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bebaea7 (Rebased)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cde4834 (Manifest_cache true)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b35d1f8 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
=======
>>>>>>> dacfb20 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
=======
>>>>>>> 78d0719 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
                with.library :active_record
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> bebaea7 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28fed3c (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed6aebd (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64d4167 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 1a9aba9 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> 49e3b70 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
                with.library :active_model
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  20. 
=======
          
  21. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  22. 
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  23. 
=======
          
  24. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  25. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  26. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  27. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
          
  28. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
          
  29. 
>>>>>>> bebaea7 (Rebased)
=======
          
  30. 
=======
          
  31. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
          
  32. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  33. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  34. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
          
  35. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  36. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
          
  37. 
>>>>>>> 1a9aba9 (Fix)
=======
          
  38. 
=======
          
  39. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
          
  40. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
          
  41. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
          
  42. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
          
  43. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  44. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
          
  45. 
>>>>>>> 49e3b70 (Fix)
=======
          
  46. 
=======
          
  47. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  48. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  49. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  50. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
          
  51. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  52. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  53. 
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

              end
          
    54. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  54. 
=======
          
  55. 
>>>>>>> cde4834 (Manifest_cache true)
=======
          
  56. 
>>>>>>> 1577aeb (Rebased)
=======
=======
>>>>>>> 56ef3ac (Featire specs)
=======
>>>>>>> 113da87 (Featire specs)
=======
>>>>>>> 8b420cf (Featire specs)
=======
>>>>>>> 20256f8 (Featire specs)
=======
>>>>>>> a1fe6da (Featire specs)
=======
>>>>>>> 28fed3c (Featire specs)
=======
>>>>>>> ed6aebd (Featire specs)
=======
>>>>>>> 64d4167 (Featire specs)
=======
>>>>>>> 13fd74f (Featire specs)
=======
>>>>>>> 93db8b1 (Featire specs)
=======
>>>>>>> 5f76842 (Featire specs)
=======
>>>>>>> ea0650c (Featire specs)
=======
>>>>>>> a038b16 (Featire specs)
=======
>>>>>>> d7fadcd (Featire specs)
=======
>>>>>>> f861b82 (Featire specs)
=======
>>>>>>> 2fd2048 (Featire specs)
=======
>>>>>>> bc0ff2c (Featire specs)
=======
>>>>>>> 9bf2aae (Featire specs)
=======
>>>>>>> 5ce1a6d (Featire specs)
          
  57. 
=======
          
  58. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c32a77 (Featire specs)
=======
=======
          
  59. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56ef3ac (Featire specs)
=======
=======
          
  60. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 113da87 (Featire specs)
=======
=======
          
  61. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8b420cf (Featire specs)
=======
=======
          
  62. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 20256f8 (Featire specs)
=======
          
  63. 
>>>>>>> bebaea7 (Rebased)
=======
          
  64. 
=======
          
  65. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> b35d1f8 (Featire specs)
=======
=======
          
  66. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> a1fe6da (Featire specs)
=======
=======
          
  67. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 28fed3c (Featire specs)
=======
=======
          
  68. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ed6aebd (Featire specs)
=======
=======
          
  69. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 64d4167 (Featire specs)
=======
=======
          
  70. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 13fd74f (Featire specs)
=======
          
  71. 
>>>>>>> 1a9aba9 (Fix)
=======
          
  72. 
=======
          
  73. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> dacfb20 (Featire specs)
=======
=======
          
  74. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 93db8b1 (Featire specs)
=======
=======
          
  75. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5f76842 (Featire specs)
=======
=======
          
  76. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ea0650c (Featire specs)
=======
=======
          
  77. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a038b16 (Featire specs)
=======
=======
          
  78. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> d7fadcd (Featire specs)
=======
          
  79. 
>>>>>>> 49e3b70 (Fix)
=======
          
  80. 
=======
          
  81. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 78d0719 (Featire specs)
=======
=======
          
  82. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> f861b82 (Featire specs)
=======
=======
          
  83. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 2fd2048 (Featire specs)
=======
=======
          
  84. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> bc0ff2c (Featire specs)
=======
=======
          
  85. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9bf2aae (Featire specs)
=======
=======
          
  86. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 5ce1a6d (Featire specs)
=======
          
  87. 
>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
            
            

            

            end
          
    88.

spec/support/configs/sidekiq.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            RSpec::Sidekiq.configure do |config|
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.warn_when_jobs_not_processed_by_sidekiq = false
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> f1f4057 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 9710ee6 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> eda022f (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 379e583 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5bc98da (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1ebea35 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> e6da150 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 7f9bd73 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1f4057 (Manifest_cache true) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 2737f2d (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> f1c7248 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9710ee6 (Manifest_cache true) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)